Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions hydrogram/dispatcher.py
Original file line number Diff line number Diff line change
Expand Up @@ -88,11 +88,11 @@ def __init__(self, client: "hydrogram.Client"):
async def message_parser(update, users, chats):
return (
await hydrogram.types.Message._parse(
self.client,
update.message,
users,
chats,
isinstance(update, UpdateNewScheduledMessage),
client=self.client,
message=update.message,
users=users,
chats=chats,
is_scheduled=isinstance(update, UpdateNewScheduledMessage),
),
MessageHandler,
)
Expand Down
8 changes: 4 additions & 4 deletions hydrogram/methods/bots/send_game.py
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,9 @@ async def send_game(
for i in r.updates:
if isinstance(i, (raw.types.UpdateNewMessage, raw.types.UpdateNewChannelMessage)):
return await types.Message._parse(
self,
i.message,
{i.id: i for i in r.users},
{i.id: i for i in r.chats},
client=self,
message=i.message,
users={i.id: i for i in r.users},
chats={i.id: i for i in r.chats},
)
return None
8 changes: 4 additions & 4 deletions hydrogram/methods/bots/set_game_score.py
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,10 @@ async def set_game_score(
for i in r.updates:
if isinstance(i, (raw.types.UpdateEditMessage, raw.types.UpdateEditChannelMessage)):
return await types.Message._parse(
self,
i.message,
{i.id: i for i in r.users},
{i.id: i for i in r.chats},
client=self,
message=i.message,
users={i.id: i for i in r.users},
chats={i.id: i for i in r.chats},
)

return True
8 changes: 4 additions & 4 deletions hydrogram/methods/chats/ban_chat_member.py
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,9 @@ async def ban_chat_member(
for i in r.updates:
if isinstance(i, (raw.types.UpdateNewMessage, raw.types.UpdateNewChannelMessage)):
return await types.Message._parse(
self,
i.message,
{i.id: i for i in r.users},
{i.id: i for i in r.chats},
client=self,
message=i.message,
users={i.id: i for i in r.users},
chats={i.id: i for i in r.chats},
)
return True
4 changes: 3 additions & 1 deletion hydrogram/methods/chats/get_dialogs.py
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,9 @@ async def get_dialogs(
continue

chat_id = utils.get_peer_id(message.peer_id)
messages[chat_id] = await types.Message._parse(self, message, users, chats)
messages[chat_id] = await types.Message._parse(
client=self, message=message, users=users, chats=chats
)

dialogs = [
types.Dialog._parse(self, dialog, messages, users, chats)
Expand Down
8 changes: 4 additions & 4 deletions hydrogram/methods/messages/edit_message_media.py
Original file line number Diff line number Diff line change
Expand Up @@ -273,9 +273,9 @@ async def edit_message_media(
for i in r.updates:
if isinstance(i, (raw.types.UpdateEditMessage, raw.types.UpdateEditChannelMessage)):
return await types.Message._parse(
self,
i.message,
{i.id: i for i in r.users},
{i.id: i for i in r.chats},
client=self,
message=i.message,
users={i.id: i for i in r.users},
chats={i.id: i for i in r.chats},
)
return None
8 changes: 4 additions & 4 deletions hydrogram/methods/messages/edit_message_reply_markup.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,9 @@ async def edit_message_reply_markup(
for i in r.updates:
if isinstance(i, (raw.types.UpdateEditMessage, raw.types.UpdateEditChannelMessage)):
return await types.Message._parse(
self,
i.message,
{i.id: i for i in r.users},
{i.id: i for i in r.chats},
client=self,
message=i.message,
users={i.id: i for i in r.users},
chats={i.id: i for i in r.chats},
)
return None
8 changes: 4 additions & 4 deletions hydrogram/methods/messages/edit_message_text.py
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,9 @@ async def edit_message_text(
for i in r.updates:
if isinstance(i, (raw.types.UpdateEditMessage, raw.types.UpdateEditChannelMessage)):
return await types.Message._parse(
self,
i.message,
{i.id: i for i in r.users},
{i.id: i for i in r.chats},
client=self,
message=i.message,
users={i.id: i for i in r.users},
chats={i.id: i for i in r.chats},
)
return None
2 changes: 1 addition & 1 deletion hydrogram/methods/messages/forward_messages.py
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ async def forward_messages(
chats = {i.id: i for i in r.chats}

forwarded_messages: list = [
await types.Message._parse(self, i.message, users, chats)
await types.Message._parse(client=self, message=i.message, users=users, chats=chats)
for i in r.updates
if isinstance(
i,
Expand Down
4 changes: 3 additions & 1 deletion hydrogram/methods/messages/get_discussion_message.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,6 @@ async def get_discussion_message(
users = {u.id: u for u in r.users}
chats = {c.id: c for c in r.chats}

return await types.Message._parse(self, r.messages[0], users, chats)
return await types.Message._parse(
client=self, message=r.messages[0], users=users, chats=chats
)
4 changes: 3 additions & 1 deletion hydrogram/methods/messages/get_discussion_replies.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,9 @@ async def get_discussion_replies(
return

for message in messages:
yield await types.Message._parse(self, message, users, chats, replies=0)
yield await types.Message._parse(
client=self, message=message, users=users, chats=chats, replies=0
)

current += 1

Expand Down
8 changes: 4 additions & 4 deletions hydrogram/methods/messages/send_audio.py
Original file line number Diff line number Diff line change
Expand Up @@ -244,10 +244,10 @@ async def progress(current, total):
),
):
return await types.Message._parse(
self,
i.message,
{i.id: i for i in r.users},
{i.id: i for i in r.chats},
client=self,
message=i.message,
users={i.id: i for i in r.users},
chats={i.id: i for i in r.chats},
is_scheduled=isinstance(i, raw.types.UpdateNewScheduledMessage),
)
except StopTransmission:
Expand Down
8 changes: 4 additions & 4 deletions hydrogram/methods/messages/send_cached_media.py
Original file line number Diff line number Diff line change
Expand Up @@ -129,10 +129,10 @@ async def send_cached_media(
),
):
return await types.Message._parse(
self,
i.message,
{i.id: i for i in r.users},
{i.id: i for i in r.chats},
client=self,
message=i.message,
users={i.id: i for i in r.users},
chats={i.id: i for i in r.chats},
is_scheduled=isinstance(i, raw.types.UpdateNewScheduledMessage),
)
return None
8 changes: 4 additions & 4 deletions hydrogram/methods/messages/send_contact.py
Original file line number Diff line number Diff line change
Expand Up @@ -128,10 +128,10 @@ async def send_contact(
),
):
return await types.Message._parse(
self,
i.message,
{i.id: i for i in r.users},
{i.id: i for i in r.chats},
client=self,
message=i.message,
users={i.id: i for i in r.users},
chats={i.id: i for i in r.chats},
is_scheduled=isinstance(i, raw.types.UpdateNewScheduledMessage),
)
return None
8 changes: 4 additions & 4 deletions hydrogram/methods/messages/send_dice.py
Original file line number Diff line number Diff line change
Expand Up @@ -122,10 +122,10 @@ async def send_dice(
),
):
return await types.Message._parse(
self,
i.message,
{i.id: i for i in r.users},
{i.id: i for i in r.chats},
client=self,
message=i.message,
users={i.id: i for i in r.users},
chats={i.id: i for i in r.chats},
is_scheduled=isinstance(i, raw.types.UpdateNewScheduledMessage),
)
return None
8 changes: 4 additions & 4 deletions hydrogram/methods/messages/send_document.py
Original file line number Diff line number Diff line change
Expand Up @@ -229,10 +229,10 @@ async def progress(current, total):
),
):
return await types.Message._parse(
self,
i.message,
{i.id: i for i in r.users},
{i.id: i for i in r.chats},
client=self,
message=i.message,
users={i.id: i for i in r.users},
chats={i.id: i for i in r.chats},
is_scheduled=isinstance(i, raw.types.UpdateNewScheduledMessage),
)
except StopTransmission:
Expand Down
8 changes: 4 additions & 4 deletions hydrogram/methods/messages/send_location.py
Original file line number Diff line number Diff line change
Expand Up @@ -117,10 +117,10 @@ async def send_location(
),
):
return await types.Message._parse(
self,
i.message,
{i.id: i for i in r.users},
{i.id: i for i in r.chats},
client=self,
message=i.message,
users={i.id: i for i in r.users},
chats={i.id: i for i in r.chats},
is_scheduled=isinstance(i, raw.types.UpdateNewScheduledMessage),
)
return None
8 changes: 4 additions & 4 deletions hydrogram/methods/messages/send_message.py
Original file line number Diff line number Diff line change
Expand Up @@ -176,10 +176,10 @@ async def send_message(
),
):
return await types.Message._parse(
self,
i.message,
{i.id: i for i in r.users},
{i.id: i for i in r.chats},
client=self,
message=i.message,
users={i.id: i for i in r.users},
chats={i.id: i for i in r.chats},
is_scheduled=isinstance(i, raw.types.UpdateNewScheduledMessage),
)
return None
8 changes: 4 additions & 4 deletions hydrogram/methods/messages/send_photo.py
Original file line number Diff line number Diff line change
Expand Up @@ -205,10 +205,10 @@ async def send_photo(
),
):
return await types.Message._parse(
self,
i.message,
{i.id: i for i in r.users},
{i.id: i for i in r.chats},
client=self,
message=i.message,
users={i.id: i for i in r.users},
chats={i.id: i for i in r.chats},
is_scheduled=isinstance(i, raw.types.UpdateNewScheduledMessage),
)
except hydrogram.StopTransmission:
Expand Down
8 changes: 4 additions & 4 deletions hydrogram/methods/messages/send_poll.py
Original file line number Diff line number Diff line change
Expand Up @@ -191,10 +191,10 @@ async def send_poll(
),
):
return await types.Message._parse(
self,
i.message,
{i.id: i for i in r.users},
{i.id: i for i in r.chats},
client=self,
message=i.message,
users={i.id: i for i in r.users},
chats={i.id: i for i in r.chats},
is_scheduled=isinstance(i, raw.types.UpdateNewScheduledMessage),
)
return None
8 changes: 4 additions & 4 deletions hydrogram/methods/messages/send_sticker.py
Original file line number Diff line number Diff line change
Expand Up @@ -181,10 +181,10 @@ async def send_sticker(
),
):
return await types.Message._parse(
self,
i.message,
{i.id: i for i in r.users},
{i.id: i for i in r.chats},
client=self,
message=i.message,
users={i.id: i for i in r.users},
chats={i.id: i for i in r.chats},
is_scheduled=isinstance(i, raw.types.UpdateNewScheduledMessage),
)
except StopTransmission:
Expand Down
8 changes: 4 additions & 4 deletions hydrogram/methods/messages/send_venue.py
Original file line number Diff line number Diff line change
Expand Up @@ -141,10 +141,10 @@ async def send_venue(
),
):
return await types.Message._parse(
self,
i.message,
{i.id: i for i in r.users},
{i.id: i for i in r.chats},
client=self,
message=i.message,
users={i.id: i for i in r.users},
chats={i.id: i for i in r.chats},
is_scheduled=isinstance(i, raw.types.UpdateNewScheduledMessage),
)
return None
8 changes: 4 additions & 4 deletions hydrogram/methods/messages/send_video.py
Original file line number Diff line number Diff line change
Expand Up @@ -269,10 +269,10 @@ async def progress(current, total):
),
):
return await types.Message._parse(
self,
i.message,
{i.id: i for i in r.users},
{i.id: i for i in r.chats},
client=self,
message=i.message,
users={i.id: i for i in r.users},
chats={i.id: i for i in r.chats},
is_scheduled=isinstance(i, raw.types.UpdateNewScheduledMessage),
)
except StopTransmission:
Expand Down
8 changes: 4 additions & 4 deletions hydrogram/methods/messages/send_video_note.py
Original file line number Diff line number Diff line change
Expand Up @@ -206,10 +206,10 @@ async def send_video_note(
),
):
return await types.Message._parse(
self,
i.message,
{i.id: i for i in r.users},
{i.id: i for i in r.chats},
client=self,
message=i.message,
users={i.id: i for i in r.users},
chats={i.id: i for i in r.chats},
is_scheduled=isinstance(i, raw.types.UpdateNewScheduledMessage),
)
except StopTransmission:
Expand Down
8 changes: 4 additions & 4 deletions hydrogram/methods/messages/send_voice.py
Original file line number Diff line number Diff line change
Expand Up @@ -200,10 +200,10 @@ async def send_voice(
),
):
return await types.Message._parse(
self,
i.message,
{i.id: i for i in r.users},
{i.id: i for i in r.chats},
client=self,
message=i.message,
users={i.id: i for i in r.users},
chats={i.id: i for i in r.chats},
is_scheduled=isinstance(i, raw.types.UpdateNewScheduledMessage),
)
except StopTransmission:
Expand Down
1 change: 1 addition & 0 deletions hydrogram/types/messages_and_media/message.py
Original file line number Diff line number Diff line change
Expand Up @@ -507,6 +507,7 @@ def __init__(

@staticmethod
async def _parse(
*,
client: "hydrogram.Client",
message: raw.base.Message,
users: dict,
Expand Down
Loading