diff --git a/arigram/controllers.py b/arigram/controllers.py index 89155cd..53ad976 100644 --- a/arigram/controllers.py +++ b/arigram/controllers.py @@ -985,7 +985,7 @@ class Controller: # TODO: handle cases when all chats muted on global level if chat["notification_settings"]["mute_for"] or self.model.is_me( - msg["sender"].get("user_id") + msg["sender_id"].get("user_id") ): return diff --git a/arigram/msg.py b/arigram/msg.py index 9fa2450..e4cdfda 100644 --- a/arigram/msg.py +++ b/arigram/msg.py @@ -220,7 +220,7 @@ class MsgProxy: @property def sender_id(self) -> int: - return self.msg["sender"].get("user_id") or self.msg["sender"].get( + return self.msg["sender_id"].get("user_id") or self.msg["sender_id"].get( "chat_id" ) diff --git a/arigram/views.py b/arigram/views.py index 244f53a..87fd35b 100644 --- a/arigram/views.py +++ b/arigram/views.py @@ -280,7 +280,7 @@ class ChatView: msg = chat.get("last_message") if ( msg - and self.model.is_me(msg["sender"].get("user_id")) + and self.model.is_me(msg["sender_id"].get("user_id")) and msg["id"] > chat["last_read_outbox_message_id"] and not self.model.is_me(chat["id"]) ): @@ -288,7 +288,7 @@ class ChatView: flags.append("unseen") elif ( msg - and self.model.is_me(msg["sender"].get("user_id")) + and self.model.is_me(msg["sender_id"].get("user_id")) and msg["id"] <= chat["last_read_outbox_message_id"] ): flags.append("seen") @@ -628,7 +628,7 @@ def get_last_msg( if not last_msg: return None, "" return ( - last_msg["sender"].get("user_id"), + last_msg["sender_id"].get("user_id"), parse_content(MsgProxy(last_msg), users), )