Fix determining video sticker resolution. Add sticker duration to Sticker type (pyrogram#1065)

L3Nya · web-flow · commit 95de5f7eae4f · 2022-08-14T10:50:48.000+02:00
diff --git a/pyrogram/methods/messages/get_custom_emoji_stickers.py b/pyrogram/methods/messages/get_custom_emoji_stickers.py
@@ -50,9 +50,10 @@ async def get_custom_emoji_stickers(
 
             sticker = await types.Sticker._parse(
                 self, item,
-                attributes[raw.types.DocumentAttributeImageSize],
+                attributes[raw.types.DocumentAttributeImageSize] if raw.types.DocumentAttributeImageSize in attributes else None,
                 attributes[raw.types.DocumentAttributeCustomEmoji],
-                attributes[raw.types.DocumentAttributeFilename].file_name
+                attributes[raw.types.DocumentAttributeFilename].file_name,
+                attributes[raw.types.DocumentAttributeVideo] if raw.types.DocumentAttributeVideo in attributes else None
             )
 
             stickers.append(sticker)
diff --git a/pyrogram/types/messages_and_media/message.py b/pyrogram/types/messages_and_media/message.py
@@ -700,7 +700,8 @@ async def _parse(
                                 client, doc,
                                 attributes.get(raw.types.DocumentAttributeImageSize, None),
                                 attributes[raw.types.DocumentAttributeSticker],
-                                file_name
+                                file_name,
+                                attributes.get(raw.types.DocumentAttributeVideo, None)
                             )
                             media_type = enums.MessageMediaType.STICKER
                         elif raw.types.DocumentAttributeVideo in attributes:
diff --git a/pyrogram/types/messages_and_media/sticker.py b/pyrogram/types/messages_and_media/sticker.py
@@ -50,6 +50,9 @@ class Sticker(Object):
         is_video (``bool``):
             True, if the sticker is a video sticker
 
+        duration (``int``):
+            Video sticker duration in seconds.
+
         file_name (``str``, *optional*):
             Sticker file name.
 
@@ -84,6 +87,7 @@ def __init__(
         height: int,
         is_animated: bool,
         is_video: bool,
+        duration: int = None,
         file_name: str = None,
         mime_type: str = None,
         file_size: int = None,
@@ -148,7 +152,8 @@ async def _parse(
         sticker: "raw.types.Document",
         image_size_attributes: "raw.types.DocumentAttributeImageSize",
         sticker_attributes: "raw.types.DocumentAttributeSticker",
-        file_name: str
+        file_name: str,
+        video_attributes: "raw.types.DocumentAttributeVideo"
     ) -> "Sticker":
         sticker_set = sticker_attributes.stickerset
 
@@ -170,10 +175,11 @@ async def _parse(
                 file_unique_type=FileUniqueType.DOCUMENT,
                 media_id=sticker.id
             ).encode(),
-            width=image_size_attributes.w if image_size_attributes else 512,
-            height=image_size_attributes.h if image_size_attributes else 512,
+            width=image_size_attributes.w if image_size_attributes else (video_attributes.w if video_attributes else 512),
+            height=image_size_attributes.h if image_size_attributes else (video_attributes.h if video_attributes else 512),
             is_animated=sticker.mime_type == "application/x-tgsticker",
             is_video=sticker.mime_type == "video/webm",
+            duration=video_attributes.duration if video_attributes else None,
             # TODO: mask_position
             set_name=set_name,
             emoji=sticker_attributes.alt or None,
