From 489bd4ac3888a9bf9ae30995949669f65ca5f0bf Mon Sep 17 00:00:00 2001 From: Dan <14043624+delivrance@users.noreply.github.com> Date: Sat, 28 Apr 2018 09:38:07 +0200 Subject: [PATCH] Remove message_parser, move all functions in utils --- pyrogram/client/client.py | 33 +- pyrogram/client/dispatcher/dispatcher.py | 6 +- pyrogram/client/message_parser.py | 608 --------------------- pyrogram/client/utils.py | 659 +++++++++++++++++++++-- 4 files changed, 641 insertions(+), 665 deletions(-) delete mode 100644 pyrogram/client/message_parser.py diff --git a/pyrogram/client/client.py b/pyrogram/client/client.py index 4a5b1d42..e93e7bc0 100644 --- a/pyrogram/client/client.py +++ b/pyrogram/client/client.py @@ -50,7 +50,6 @@ from pyrogram.api.errors import ( from pyrogram.crypto import AES from pyrogram.session import Auth, Session from pyrogram.session.internals import MsgId -from . import message_parser from . import types as pyrogram_types from . import utils from .dispatcher import Dispatcher @@ -1177,7 +1176,7 @@ class Client: for i in r.updates: if isinstance(i, (types.UpdateNewMessage, types.UpdateNewChannelMessage)): messages.append( - message_parser.parse_message(self, i.message, users, chats) + utils.parse_message(self, i.message, users, chats) ) return messages if is_list else messages[0] @@ -1301,7 +1300,7 @@ class Client: users = {i.id: i for i in r.users} chats = {i.id: i for i in r.chats} - return message_parser.parse_message(self, i.message, users, chats) + return utils.parse_message(self, i.message, users, chats) def send_audio(self, chat_id: int or str, @@ -1436,7 +1435,7 @@ class Client: users = {i.id: i for i in r.users} chats = {i.id: i for i in r.chats} - return message_parser.parse_message(self, i.message, users, chats) + return utils.parse_message(self, i.message, users, chats) def send_document(self, chat_id: int or str, @@ -1552,7 +1551,7 @@ class Client: users = {i.id: i for i in r.users} chats = {i.id: i for i in r.chats} - return message_parser.parse_message(self, i.message, users, chats) + return utils.parse_message(self, i.message, users, chats) def send_sticker(self, chat_id: int or str, @@ -1657,7 +1656,7 @@ class Client: users = {i.id: i for i in r.users} chats = {i.id: i for i in r.chats} - return message_parser.parse_message(self, i.message, users, chats) + return utils.parse_message(self, i.message, users, chats) def send_video(self, chat_id: int or str, @@ -1803,7 +1802,7 @@ class Client: users = {i.id: i for i in r.users} chats = {i.id: i for i in r.chats} - return message_parser.parse_message(self, i.message, users, chats) + return utils.parse_message(self, i.message, users, chats) def send_voice(self, chat_id: int or str, @@ -1926,7 +1925,7 @@ class Client: users = {i.id: i for i in r.users} chats = {i.id: i for i in r.chats} - return message_parser.parse_message(self, i.message, users, chats) + return utils.parse_message(self, i.message, users, chats) def send_video_note(self, chat_id: int or str, @@ -2040,7 +2039,7 @@ class Client: users = {i.id: i for i in r.users} chats = {i.id: i for i in r.chats} - return message_parser.parse_message(self, i.message, users, chats) + return utils.parse_message(self, i.message, users, chats) # TODO: Add progress parameter # TODO: Return new Message object @@ -2238,7 +2237,7 @@ class Client: users = {i.id: i for i in r.users} chats = {i.id: i for i in r.chats} - return message_parser.parse_message(self, i.message, users, chats) + return utils.parse_message(self, i.message, users, chats) def send_venue(self, chat_id: int or str, @@ -2312,7 +2311,7 @@ class Client: users = {i.id: i for i in r.users} chats = {i.id: i for i in r.chats} - return message_parser.parse_message(self, i.message, users, chats) + return utils.parse_message(self, i.message, users, chats) def send_contact(self, chat_id: int or str, @@ -2372,7 +2371,7 @@ class Client: users = {i.id: i for i in r.users} chats = {i.id: i for i in r.chats} - return message_parser.parse_message(self, i.message, users, chats) + return utils.parse_message(self, i.message, users, chats) def send_chat_action(self, chat_id: int or str, @@ -2500,7 +2499,7 @@ class Client: users = {i.id: i for i in r.users} chats = {i.id: i for i in r.chats} - return message_parser.parse_message(self, i.message, users, chats) + return utils.parse_message(self, i.message, users, chats) def edit_message_caption(self, chat_id: int or str, @@ -2548,7 +2547,7 @@ class Client: users = {i.id: i for i in r.users} chats = {i.id: i for i in r.chats} - return message_parser.parse_message(self, i.message, users, chats) + return utils.parse_message(self, i.message, users, chats) def delete_messages(self, chat_id: int or str, @@ -3407,20 +3406,20 @@ class Client: for i in r.messages: if isinstance(i, types.Message): messages.append( - message_parser.parse_message( + utils.parse_message( self, i, users, chats, replies=replies ) ) elif isinstance(i, types.MessageService): messages.append( - message_parser.parse_message_service( + utils.parse_message_service( self, i, users, chats ) ) else: messages.append( - message_parser.parse_message_empty( + utils.parse_message_empty( self, i ) ) diff --git a/pyrogram/client/dispatcher/dispatcher.py b/pyrogram/client/dispatcher/dispatcher.py index 6f96876c..5e89049f 100644 --- a/pyrogram/client/dispatcher/dispatcher.py +++ b/pyrogram/client/dispatcher/dispatcher.py @@ -24,7 +24,7 @@ from threading import Thread import pyrogram from pyrogram.api import types -from .. import message_parser +from .. import utils from ..handlers import RawUpdateHandler, MessageHandler log = logging.getLogger(__name__) @@ -119,9 +119,9 @@ class Dispatcher: if isinstance(update, Dispatcher.ALLOWED_UPDATES): if isinstance(update.message, types.Message): - parser = message_parser.parse_message + parser = utils.parse_message elif isinstance(update.message, types.MessageService): - parser = message_parser.parse_message_service + parser = utils.parse_message_service else: continue diff --git a/pyrogram/client/message_parser.py b/pyrogram/client/message_parser.py deleted file mode 100644 index c0ca13a7..00000000 --- a/pyrogram/client/message_parser.py +++ /dev/null @@ -1,608 +0,0 @@ -# Pyrogram - Telegram MTProto API Client Library for Python -# Copyright (C) 2017-2018 Dan Tès -# -# This file is part of Pyrogram. -# -# Pyrogram is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as published -# by the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Pyrogram is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with Pyrogram. If not, see . - -from struct import pack - -from . import types as pyrogram_types -from .utils import encode -from ..api import types, functions -from ..api.errors import StickersetInvalid - -# TODO: Organize the code better? - -ENTITIES = { - types.MessageEntityMention.ID: "mention", - types.MessageEntityHashtag.ID: "hashtag", - types.MessageEntityBotCommand.ID: "bot_command", - types.MessageEntityUrl.ID: "url", - types.MessageEntityEmail.ID: "email", - types.MessageEntityBold.ID: "bold", - types.MessageEntityItalic.ID: "italic", - types.MessageEntityCode.ID: "code", - types.MessageEntityPre.ID: "pre", - types.MessageEntityTextUrl.ID: "text_link", - types.MessageEntityMentionName.ID: "text_mention" -} - - -def parse_entities(entities: list, users: dict) -> list: - output_entities = [] - - for entity in entities: - entity_type = ENTITIES.get(entity.ID, None) - - if entity_type: - output_entities.append(pyrogram_types.MessageEntity( - type=entity_type, - offset=entity.offset, - length=entity.length, - url=getattr(entity, "url", None), - user=parse_user( - users.get( - getattr(entity, "user_id", None), - None - ) - ) - )) - - return output_entities - - -def parse_chat_photo(photo): - if not isinstance(photo, (types.UserProfilePhoto, types.ChatPhoto)): - return None - - if not isinstance(photo.photo_small, types.FileLocation): - return None - - if not isinstance(photo.photo_big, types.FileLocation): - return None - - loc_small = photo.photo_small - loc_big = photo.photo_big - - return pyrogram_types.ChatPhoto( - small_file_id=encode( - pack( - " pyrogram_types.User or None: - return pyrogram_types.User( - id=user.id, - is_bot=user.bot, - first_name=user.first_name, - last_name=user.last_name, - username=user.username, - language_code=user.lang_code, - phone_number=user.phone, - photo=parse_chat_photo(user.photo) - ) if user else None - - -def parse_chat(message: types.Message, users: dict, chats: dict) -> pyrogram_types.Chat: - if isinstance(message.to_id, types.PeerUser): - return parse_user_chat(users[message.to_id.user_id if message.out else message.from_id]) - elif isinstance(message.to_id, types.PeerChat): - return parse_chat_chat(chats[message.to_id.chat_id]) - else: - return parse_channel_chat(chats[message.to_id.channel_id]) - - -def parse_user_chat(user: types.User) -> pyrogram_types.Chat: - return pyrogram_types.Chat( - id=user.id, - type="private", - username=user.username, - first_name=user.first_name, - last_name=user.last_name, - photo=parse_chat_photo(user.photo) - ) - - -def parse_chat_chat(chat: types.Chat) -> pyrogram_types.Chat: - return pyrogram_types.Chat( - id=-chat.id, - type="group", - title=chat.title, - all_members_are_administrators=not chat.admins_enabled, - photo=parse_chat_photo(chat.photo) - ) - - -def parse_channel_chat(channel: types.Channel) -> pyrogram_types.Chat: - return pyrogram_types.Chat( - id=int("-100" + str(channel.id)), - type="supergroup" if channel.megagroup else "channel", - title=channel.title, - username=getattr(channel, "username", None), - photo=parse_chat_photo(getattr(channel, "photo", None)) - ) - - -def parse_thumb(thumb: types.PhotoSize or types.PhotoCachedSize) -> pyrogram_types.PhotoSize or None: - if isinstance(thumb, (types.PhotoSize, types.PhotoCachedSize)): - loc = thumb.location - - if isinstance(thumb, types.PhotoSize): - file_size = thumb.size - else: - file_size = len(thumb.bytes) - - if isinstance(loc, types.FileLocation): - return pyrogram_types.PhotoSize( - file_id=encode( - pack( - " pyrogram_types.Message: - entities = parse_entities(message.entities, users) - - forward_from = None - forward_from_chat = None - forward_from_message_id = None - forward_signature = None - forward_date = None - - forward_header = message.fwd_from # type: types.MessageFwdHeader - - if forward_header: - forward_date = forward_header.date - - if forward_header.from_id: - forward_from = parse_user(users[forward_header.from_id]) - else: - forward_from_chat = parse_channel_chat(chats[forward_header.channel_id]) - forward_from_message_id = forward_header.channel_post - forward_signature = forward_header.post_author - - photo = None - location = None - contact = None - venue = None - audio = None - voice = None - video = None - video_note = None - sticker = None - document = None - - media = message.media - - if media: - if isinstance(media, types.MessageMediaPhoto): - photo = media.photo - - if isinstance(photo, types.Photo): - sizes = photo.sizes - photo_sizes = [] - - for size in sizes: - if isinstance(size, (types.PhotoSize, types.PhotoCachedSize)): - loc = size.location - - if isinstance(size, types.PhotoSize): - file_size = size.size - else: - file_size = len(size.bytes) - - if isinstance(loc, types.FileLocation): - photo_size = pyrogram_types.PhotoSize( - file_id=encode( - pack( - " pyrogram_types.Message: - action = message.action - - new_chat_members = None - left_chat_member = None - new_chat_title = None - delete_chat_photo = None - migrate_to_chat_id = None - migrate_from_chat_id = None - group_chat_created = None - channel_chat_created = None - new_chat_photo = None - - if isinstance(action, types.MessageActionChatAddUser): - new_chat_members = [parse_user(users[i]) for i in action.users] - elif isinstance(action, types.MessageActionChatJoinedByLink): - new_chat_members = [parse_user(users[message.from_id])] - elif isinstance(action, types.MessageActionChatDeleteUser): - left_chat_member = parse_user(users[action.user_id]) - elif isinstance(action, types.MessageActionChatEditTitle): - new_chat_title = action.title - elif isinstance(action, types.MessageActionChatDeletePhoto): - delete_chat_photo = True - elif isinstance(action, types.MessageActionChatMigrateTo): - migrate_to_chat_id = action.channel_id - elif isinstance(action, types.MessageActionChannelMigrateFrom): - migrate_from_chat_id = action.chat_id - elif isinstance(action, types.MessageActionChatCreate): - group_chat_created = True - elif isinstance(action, types.MessageActionChannelCreate): - channel_chat_created = True - elif isinstance(action, types.MessageActionChatEditPhoto): - photo = action.photo - - if isinstance(photo, types.Photo): - sizes = photo.sizes - photo_sizes = [] - - for size in sizes: - if isinstance(size, (types.PhotoSize, types.PhotoCachedSize)): - loc = size.location - - if isinstance(size, types.PhotoSize): - file_size = size.size - else: - file_size = len(size.bytes) - - if isinstance(loc, types.FileLocation): - photo_size = pyrogram_types.PhotoSize( - file_id=encode( - pack( - " pyrogram_types.Message: - return pyrogram_types.Message(message_id=message.id, client=client) diff --git a/pyrogram/client/utils.py b/pyrogram/client/utils.py index 221cdab5..da45acda 100644 --- a/pyrogram/client/utils.py +++ b/pyrogram/client/utils.py @@ -19,8 +19,629 @@ from base64 import b64decode, b64encode from struct import pack -from pyrogram.api import types from pyrogram.client import types as pyrogram_types +from ..api import types, functions +from ..api.errors import StickersetInvalid + +# TODO: Organize the code better? + +ENTITIES = { + types.MessageEntityMention.ID: "mention", + types.MessageEntityHashtag.ID: "hashtag", + types.MessageEntityBotCommand.ID: "bot_command", + types.MessageEntityUrl.ID: "url", + types.MessageEntityEmail.ID: "email", + types.MessageEntityBold.ID: "bold", + types.MessageEntityItalic.ID: "italic", + types.MessageEntityCode.ID: "code", + types.MessageEntityPre.ID: "pre", + types.MessageEntityTextUrl.ID: "text_link", + types.MessageEntityMentionName.ID: "text_mention" +} + + +def parse_entities(entities: list, users: dict) -> list: + output_entities = [] + + for entity in entities: + entity_type = ENTITIES.get(entity.ID, None) + + if entity_type: + output_entities.append(pyrogram_types.MessageEntity( + type=entity_type, + offset=entity.offset, + length=entity.length, + url=getattr(entity, "url", None), + user=parse_user( + users.get( + getattr(entity, "user_id", None), + None + ) + ) + )) + + return output_entities + + +def parse_chat_photo(photo): + if not isinstance(photo, (types.UserProfilePhoto, types.ChatPhoto)): + return None + + if not isinstance(photo.photo_small, types.FileLocation): + return None + + if not isinstance(photo.photo_big, types.FileLocation): + return None + + loc_small = photo.photo_small + loc_big = photo.photo_big + + return pyrogram_types.ChatPhoto( + small_file_id=encode( + pack( + " pyrogram_types.User or None: + return pyrogram_types.User( + id=user.id, + is_bot=user.bot, + first_name=user.first_name, + last_name=user.last_name, + username=user.username, + language_code=user.lang_code, + phone_number=user.phone, + photo=parse_chat_photo(user.photo) + ) if user else None + + +def parse_chat(message: types.Message, users: dict, chats: dict) -> pyrogram_types.Chat: + if isinstance(message.to_id, types.PeerUser): + return parse_user_chat(users[message.to_id.user_id if message.out else message.from_id]) + elif isinstance(message.to_id, types.PeerChat): + return parse_chat_chat(chats[message.to_id.chat_id]) + else: + return parse_channel_chat(chats[message.to_id.channel_id]) + + +def parse_user_chat(user: types.User) -> pyrogram_types.Chat: + return pyrogram_types.Chat( + id=user.id, + type="private", + username=user.username, + first_name=user.first_name, + last_name=user.last_name, + photo=parse_chat_photo(user.photo) + ) + + +def parse_chat_chat(chat: types.Chat) -> pyrogram_types.Chat: + return pyrogram_types.Chat( + id=-chat.id, + type="group", + title=chat.title, + all_members_are_administrators=not chat.admins_enabled, + photo=parse_chat_photo(chat.photo) + ) + + +def parse_channel_chat(channel: types.Channel) -> pyrogram_types.Chat: + return pyrogram_types.Chat( + id=int("-100" + str(channel.id)), + type="supergroup" if channel.megagroup else "channel", + title=channel.title, + username=getattr(channel, "username", None), + photo=parse_chat_photo(getattr(channel, "photo", None)) + ) + + +def parse_thumb(thumb: types.PhotoSize or types.PhotoCachedSize) -> pyrogram_types.PhotoSize or None: + if isinstance(thumb, (types.PhotoSize, types.PhotoCachedSize)): + loc = thumb.location + + if isinstance(thumb, types.PhotoSize): + file_size = thumb.size + else: + file_size = len(thumb.bytes) + + if isinstance(loc, types.FileLocation): + return pyrogram_types.PhotoSize( + file_id=encode( + pack( + " bytes: + s = b64decode(s + "=" * (-len(s) % 4), "-_") + r = b"" + + assert s[-1] == 2 + + i = 0 + while i < len(s) - 1: + if s[i] != 0: + r += bytes([s[i]]) + else: + r += b"\x00" * s[i + 1] + i += 1 + + i += 1 + + return r + + +def encode(s: bytes) -> str: + r = b"" + n = 0 + + for i in s + bytes([2]): + if i == 0: + n += 1 + else: + if n: + r += b"\x00" + bytes([n]) + n = 0 + + r += bytes([i]) + + return b64encode(r, b"-_").decode().rstrip("=") + + +# TODO: Reorganize code, maybe split parts as well +def parse_message( + client, + message: types.Message, + users: dict, + chats: dict, + replies: int = 1 +) -> pyrogram_types.Message: + entities = parse_entities(message.entities, users) + + forward_from = None + forward_from_chat = None + forward_from_message_id = None + forward_signature = None + forward_date = None + + forward_header = message.fwd_from # type: types.MessageFwdHeader + + if forward_header: + forward_date = forward_header.date + + if forward_header.from_id: + forward_from = parse_user(users[forward_header.from_id]) + else: + forward_from_chat = parse_channel_chat(chats[forward_header.channel_id]) + forward_from_message_id = forward_header.channel_post + forward_signature = forward_header.post_author + + photo = None + location = None + contact = None + venue = None + audio = None + voice = None + video = None + video_note = None + sticker = None + document = None + + media = message.media + + if media: + if isinstance(media, types.MessageMediaPhoto): + photo = media.photo + + if isinstance(photo, types.Photo): + sizes = photo.sizes + photo_sizes = [] + + for size in sizes: + if isinstance(size, (types.PhotoSize, types.PhotoCachedSize)): + loc = size.location + + if isinstance(size, types.PhotoSize): + file_size = size.size + else: + file_size = len(size.bytes) + + if isinstance(loc, types.FileLocation): + photo_size = pyrogram_types.PhotoSize( + file_id=encode( + pack( + " pyrogram_types.Message: + action = message.action + + new_chat_members = None + left_chat_member = None + new_chat_title = None + delete_chat_photo = None + migrate_to_chat_id = None + migrate_from_chat_id = None + group_chat_created = None + channel_chat_created = None + new_chat_photo = None + + if isinstance(action, types.MessageActionChatAddUser): + new_chat_members = [parse_user(users[i]) for i in action.users] + elif isinstance(action, types.MessageActionChatJoinedByLink): + new_chat_members = [parse_user(users[message.from_id])] + elif isinstance(action, types.MessageActionChatDeleteUser): + left_chat_member = parse_user(users[action.user_id]) + elif isinstance(action, types.MessageActionChatEditTitle): + new_chat_title = action.title + elif isinstance(action, types.MessageActionChatDeletePhoto): + delete_chat_photo = True + elif isinstance(action, types.MessageActionChatMigrateTo): + migrate_to_chat_id = action.channel_id + elif isinstance(action, types.MessageActionChannelMigrateFrom): + migrate_from_chat_id = action.chat_id + elif isinstance(action, types.MessageActionChatCreate): + group_chat_created = True + elif isinstance(action, types.MessageActionChannelCreate): + channel_chat_created = True + elif isinstance(action, types.MessageActionChatEditPhoto): + photo = action.photo + + if isinstance(photo, types.Photo): + sizes = photo.sizes + photo_sizes = [] + + for size in sizes: + if isinstance(size, (types.PhotoSize, types.PhotoCachedSize)): + loc = size.location + + if isinstance(size, types.PhotoSize): + file_size = size.size + else: + file_size = len(size.bytes) + + if isinstance(loc, types.FileLocation): + photo_size = pyrogram_types.PhotoSize( + file_id=encode( + pack( + " pyrogram_types.Message: + return pyrogram_types.Message(message_id=message.id, client=client) def get_peer_id(input_peer) -> int: @@ -100,39 +721,3 @@ def parse_photos(photos): total_count=total_count, photos=user_profile_photos ) - - -def decode(s: str) -> bytes: - s = b64decode(s + "=" * (-len(s) % 4), "-_") - r = b"" - - assert s[-1] == 2 - - i = 0 - while i < len(s) - 1: - if s[i] != 0: - r += bytes([s[i]]) - else: - r += b"\x00" * s[i + 1] - i += 1 - - i += 1 - - return r - - -def encode(s: bytes) -> str: - r = b"" - n = 0 - - for i in s + bytes([2]): - if i == 0: - n += 1 - else: - if n: - r += b"\x00" + bytes([n]) - n = 0 - - r += bytes([i]) - - return b64encode(r, b"-_").decode().rstrip("=")