From 14f23d388c41f8e7e47757d4b7cfb0442623c4bf Mon Sep 17 00:00:00 2001 From: Dan <14043624+delivrance@users.noreply.github.com> Date: Wed, 9 May 2018 20:27:29 +0200 Subject: [PATCH] Clean get_history --- pyrogram/client/ext/base_client.py | 8 ++++++++ .../client/methods/messages/get_history.py | 19 +++++++++++++++---- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/pyrogram/client/ext/base_client.py b/pyrogram/client/ext/base_client.py index 1cb7ec30..04862e88 100644 --- a/pyrogram/client/ext/base_client.py +++ b/pyrogram/client/ext/base_client.py @@ -93,3 +93,11 @@ class BaseClient: progress_args: tuple = () ): pass + + def get_messages( + self, + chat_id: int or str, + message_ids, + replies: int = 1 + ): + pass diff --git a/pyrogram/client/methods/messages/get_history.py b/pyrogram/client/methods/messages/get_history.py index 15dd3395..c2acb423 100644 --- a/pyrogram/client/methods/messages/get_history.py +++ b/pyrogram/client/methods/messages/get_history.py @@ -16,7 +16,7 @@ # You should have received a copy of the GNU Lesser General Public License # along with Pyrogram. If not, see . -from pyrogram.api import functions, types +from pyrogram.api import functions from ...ext import BaseClient, utils @@ -69,17 +69,28 @@ class GetHistory(BaseClient): users = {i.id: i for i in r.users} chats = {i.id: i for i in r.chats} - reply_to_messages = {i.reply_to_msg_id: None for i in r.messages if i.reply_to_msg_id} + reply_to_messages = { + i.reply_to_msg_id: None + for i in r.messages + if i.reply_to_msg_id + } if reply_to_messages: - temp = self.get_messages(chat_id, reply_to_messages.keys(), replies=0) + temp = self.get_messages( + chat_id, reply_to_messages, + replies=0 + ) assert len(temp) == len(reply_to_messages) for i in range(len(temp)): reply_to_messages[temp[i].message_id] = temp[i] - messages = utils.parse_messages(self, r.messages, users, chats, replies=0) + messages = utils.parse_messages( + self, r.messages, + users, chats, + replies=0 + ) assert len(messages) == len(r.messages)