add animated_sticker

Signed-off-by: Ari Archer <ari.web.xyz@gmail.com>

arigram/msg.py

@@ -20,6 +20,10 @@ class MsgProxy:
         "messageSticker": ("sticker", "thumbnail", "photo"),
         "messagePoll": (),
         "messageAnimation": ("animation", "animation"),
+        "messageAnimatedEmoji": (
+            "animated_emoji",
+            "sticker",
+        ),
     }
 
     types = {
@@ -33,6 +37,7 @@ class MsgProxy:
         "messageSticker": "sticker",
         "messagePoll": "poll",
         "messageAnimation": "animation",
+        "messageAnimatedEmoji": "animated_emoji",
     }
 
     @classmethod
@@ -43,15 +48,19 @@ class MsgProxy:
         if fields is None:
             log.error("msg type not supported: %s", _type)
             return {}
+
         for field in fields[:deep]:
             if isinstance(field, int):
                 doc = doc[field]
             else:
                 doc = doc.get(field)
-            if "file" in doc:
+
-                return doc["file"]
             if doc is None:
                 return {}
+
+            if "file" in doc:
+                return doc["file"]
+
         return doc
 
     def __init__(self, msg: Dict[str, Any]) -> None:
@@ -245,12 +254,26 @@ class MsgProxy:
 
     @property
     def sticker_emoji(self) -> Optional[str]:
-        if self.content_type != "sticker":
+        if self.content_type not in (
+            "sticker",
+            "animated_emoji",
+        ):
             return None
-        return self.msg["content"].get("sticker", {}).get("emoji")
+
+        content = self.msg["content"].get(self.content_type, {})
+
+        return content.get("emoji") or content.get("sticker", {}).get("emoji")
 
     @property
     def is_animated(self) -> Optional[bool]:
-        if self.content_type != "sticker":
+        if self.content_type not in (
+            "sticker",
+            "animated_emoji",
+        ):
             return None
-        return self.msg["content"].get("sticker", {}).get("is_animated")
+
+        content = self.msg["content"].get(self.content_type, {})
+
+        return content.get("is_animated") or content.get("sticker", {}).get(
+            "is_animated"
+        )

arigram/views.py

@@ -664,24 +664,25 @@ def parse_content(msg: MsgProxy, users: UserModel) -> str:
     content = msg["content"]
     _type = content["@type"]
 
-    if _type == "messageBasicGroupChatCreate":
+    match _type:
-        return f"[created the group \"{content['title']}\"]"
+        case "messageBasicGroupChatCreate":
-    if _type == "messageChatAddMembers":
+            return f"[created the group \"{content['title']}\"]"
-        user_ids = content["member_user_ids"]
+        case "messageChatAddMembers":
-        if user_ids[0] == msg.sender_id:
+            user_ids = content["member_user_ids"]
-            return "[joined the group]"
+            if user_ids[0] == msg.sender_id:
-        users_name = ", ".join(
+                return "[joined the group]"
-            users.get_user_label(user_id) for user_id in user_ids
+            users_name = ", ".join(
-        )
+                users.get_user_label(user_id) for user_id in user_ids
-        return f"[added {users_name}]"
+            )
-    if _type == "messageChatDeleteMember":
+            return f"[added {users_name}]"
-        user_id = content["user_id"]
+        case "messageChatDeleteMember":
-        if user_id == msg.sender_id:
+            user_id = content["user_id"]
-            return "[left the group]"
+            if user_id == msg.sender_id:
-        user_name = users.get_user_label(user_id)
+                return "[left the group]"
-        return f"[removed {user_name}]"
+            user_name = users.get_user_label(user_id)
-    if _type == "messageChatChangeTitle":
+            return f"[removed {user_name}]"
-        return f"[changed the group name to \"{content['title']}\"]"
+        case "messageChatChangeTitle":
+            return f"[changed the group name to \"{content['title']}\"]"
 
     if not msg.content_type:
         # not implemented

pyproject.toml

@@ -4,7 +4,6 @@ version = "0.1.1"
 description = "A fork of tg -- a hackable telegram TUI client"
 authors = ["TruncatedDinosour <truncateddinosour@gmail.com>"]
 license = "Unlicense"
-packages = [{ include = "arigram"}]
 readme = "README.md"
 homepage = "https://github.com/TruncatedDinosour/arigram"
 repository = "https://github.com/TruncatedDinosour/arigram"