From aae6a26654e5b785566f4534d7e47fafe2735fe3 Mon Sep 17 00:00:00 2001 From: Lonami Exo Date: Sun, 8 Apr 2018 16:02:22 +0200 Subject: [PATCH] Add even more missing await keywords --- telethon/events/chataction.py | 8 ++++---- telethon/events/messageread.py | 2 +- telethon/events/newmessage.py | 16 ++++++++-------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/telethon/events/chataction.py b/telethon/events/chataction.py index ef5dd3a0..be377cd6 100644 --- a/telethon/events/chataction.py +++ b/telethon/events/chataction.py @@ -164,7 +164,7 @@ class ChatAction(EventBuilder): Responds to the chat action message (not as a reply). Shorthand for ``client.send_message(event.chat, ...)``. """ - return await self._client.send_message(self.input_chat, *args, **kwargs) + return await self._client.send_message(await self.input_chat, *args, **kwargs) async def reply(self, *args, **kwargs): """ @@ -177,7 +177,7 @@ class ChatAction(EventBuilder): return self.respond(*args, **kwargs) kwargs['reply_to'] = self.action_message.id - return await self._client.send_message(self.input_chat, *args, **kwargs) + return await self._client.send_message(await self.input_chat, *args, **kwargs) async def delete(self, *args, **kwargs): """ @@ -189,7 +189,7 @@ class ChatAction(EventBuilder): Does nothing if no message action triggered this event. """ if self.action_message: - return await self._client.delete_messages(self.input_chat, + return await self._client.delete_messages(await self.input_chat, [self.action_message], *args, **kwargs) @@ -202,7 +202,7 @@ class ChatAction(EventBuilder): if self._pinned_message == 0: return None - if isinstance(self._pinned_message, int) and self.input_chat: + if isinstance(self._pinned_message, int) and await self.input_chat: r = await self._client(functions.channels.GetMessagesRequest( self._input_chat, [ types.InputMessageID(self._pinned_message) diff --git a/telethon/events/messageread.py b/telethon/events/messageread.py index b6cc4606..9c1d77cb 100644 --- a/telethon/events/messageread.py +++ b/telethon/events/messageread.py @@ -97,7 +97,7 @@ class MessageRead(EventBuilder): was read instead checking if it's in here. """ if self._messages is None: - chat = self.input_chat + chat = await self.input_chat if not chat: self._messages = [] elif isinstance(chat, types.InputPeerChannel): diff --git a/telethon/events/newmessage.py b/telethon/events/newmessage.py index c21c882e..2ae7a184 100644 --- a/telethon/events/newmessage.py +++ b/telethon/events/newmessage.py @@ -158,7 +158,7 @@ class NewMessage(EventBuilder): Responds to the message (not as a reply). This is a shorthand for ``client.send_message(event.chat, ...)``. """ - return await self._client.send_message(self.input_chat, *args, **kwargs) + return await self._client.send_message(await self.input_chat, *args, **kwargs) async def reply(self, *args, **kwargs): """ @@ -166,7 +166,7 @@ class NewMessage(EventBuilder): ``client.send_message(event.chat, ..., reply_to=event.message.id)``. """ kwargs['reply_to'] = self.message.id - return await self._client.send_message(self.input_chat, *args, **kwargs) + return await self._client.send_message(await self.input_chat, *args, **kwargs) async def forward_to(self, *args, **kwargs): """ @@ -174,7 +174,7 @@ class NewMessage(EventBuilder): ``client.forward_messages(entity, event.message, event.chat)``. """ kwargs['messages'] = self.message.id - kwargs['from_peer'] = self.input_chat + kwargs['from_peer'] = await self.input_chat return await self._client.forward_messages(*args, **kwargs) async def edit(self, *args, **kwargs): @@ -194,7 +194,7 @@ class NewMessage(EventBuilder): if self.message.to_id.user_id != me.user_id: return None - return await self._client.edit_message(self.input_chat, + return await self._client.edit_message(await self.input_chat, self.message, *args, **kwargs) @@ -205,7 +205,7 @@ class NewMessage(EventBuilder): This is a shorthand for ``client.delete_messages(event.chat, event.message, ...)``. """ - return await self._client.delete_messages(self.input_chat, + return await self._client.delete_messages(await self.input_chat, [self.message], *args, **kwargs) @@ -232,7 +232,7 @@ class NewMessage(EventBuilder): self._sender, self._input_sender = await self._get_entity( self.message.id, self.message.from_id, - chat=self.input_chat + chat=await self.input_chat ) return self._input_sender @@ -295,9 +295,9 @@ class NewMessage(EventBuilder): return None if self._reply_message is None: - if isinstance(self.input_chat, types.InputPeerChannel): + if isinstance(await self.input_chat, types.InputPeerChannel): r = await self._client(functions.channels.GetMessagesRequest( - self.input_chat, [ + await self.input_chat, [ types.InputMessageID(self.message.reply_to_msg_id) ] ))