Make all parse methods protected to hide them from the lib user · stack-queue/pyrogram@e8fbae3 · GitHub
Skip to content

Commit e8fbae3

Browse files
committed
Make all parse methods protected to hide them from the lib user
1 parent b79f395 commit e8fbae3

26 files changed

Lines changed: 87 additions & 87 deletions

pyrogram/client/dispatcher/dispatcher.py

Lines changed: 4 additions & 4 deletions

pyrogram/client/types/bots/callback_query.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ def __init__(self,
7777
self.game_short_name = game_short_name
7878

7979
@staticmethod
80-
def parse(client, callback_query, users) -> "CallbackQuery":
80+
def _parse(client, callback_query, users) -> "CallbackQuery":
8181
message = None
8282
inline_message_id = None
8383

@@ -105,7 +105,7 @@ def parse(client, callback_query, users) -> "CallbackQuery":
105105

106106
return CallbackQuery(
107107
id=str(callback_query.query_id),
108-
from_user=User.parse(client, users[callback_query.user_id]),
108+
from_user=User._parse(client, users[callback_query.user_id]),
109109
message=message,
110110
inline_message_id=inline_message_id,
111111
chat_instance=str(callback_query.chat_instance),

pyrogram/client/types/messages_and_media/animation.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ def __init__(self,
8181
self.duration = duration
8282

8383
@staticmethod
84-
def parse(client, animation: types.Document, video_attributes: types.DocumentAttributeVideo,
84+
def _parse(client, animation: types.Document, video_attributes: types.DocumentAttributeVideo,
8585
file_name: str) -> "Animation":
8686
return Animation(
8787
file_id=encode(
@@ -96,7 +96,7 @@ def parse(client, animation: types.Document, video_attributes: types.DocumentAtt
9696
width=getattr(video_attributes, "w", 0),
9797
height=getattr(video_attributes, "h", 0),
9898
duration=getattr(video_attributes, "duration", 0),
99-
thumb=PhotoSize.parse(client, animation.thumb),
99+
thumb=PhotoSize._parse(client, animation.thumb),
100100
mime_type=animation.mime_type,
101101
file_size=animation.size,
102102
file_name=file_name,

pyrogram/client/types/messages_and_media/audio.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ def __init__(self,
8181
self.title = title
8282

8383
@staticmethod
84-
def parse(client, audio: types.Document, audio_attributes: types.DocumentAttributeAudio, file_name: str) -> "Audio":
84+
def _parse(client, audio: types.Document, audio_attributes: types.DocumentAttributeAudio, file_name: str) -> "Audio":
8585
return Audio(
8686
file_id=encode(
8787
pack(
@@ -97,7 +97,7 @@ def parse(client, audio: types.Document, audio_attributes: types.DocumentAttribu
9797
title=audio_attributes.title,
9898
mime_type=audio.mime_type,
9999
file_size=audio.size,
100-
thumb=PhotoSize.parse(client, audio.thumb),
100+
thumb=PhotoSize._parse(client, audio.thumb),
101101
file_name=file_name,
102102
date=audio.date,
103103
client=client

pyrogram/client/types/messages_and_media/contact.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ def __init__(self,
5757
self.vcard = vcard
5858

5959
@staticmethod
60-
def parse(client, contact: types.MessageMediaContact) -> "Contact":
60+
def _parse(client, contact: types.MessageMediaContact) -> "Contact":
6161
return Contact(
6262
phone_number=contact.phone_number,
6363
first_name=contact.first_name,

pyrogram/client/types/messages_and_media/document.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ def __init__(self,
6666
self.date = date
6767

6868
@staticmethod
69-
def parse(client, document: types.Document, file_name: str) -> "Document":
69+
def _parse(client, document: types.Document, file_name: str) -> "Document":
7070
return Document(
7171
file_id=encode(
7272
pack(
@@ -77,7 +77,7 @@ def parse(client, document: types.Document, file_name: str) -> "Document":
7777
document.access_hash
7878
)
7979
),
80-
thumb=PhotoSize.parse(client, document.thumb),
80+
thumb=PhotoSize._parse(client, document.thumb),
8181
file_name=file_name,
8282
mime_type=document.mime_type,
8383
file_size=document.size,

pyrogram/client/types/messages_and_media/location.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ def __init__(self, *, client, longitude: float, latitude: float):
3838
self.latitude = latitude
3939

4040
@staticmethod
41-
def parse(client, geo_point: types.GeoPoint) -> "Location":
41+
def _parse(client, geo_point: types.GeoPoint) -> "Location":
4242
if isinstance(geo_point, types.GeoPoint):
4343
return Location(
4444
longitude=geo_point.long,

pyrogram/client/types/messages_and_media/message.py

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ def __init__(self,
336336
self.reply_markup = reply_markup
337337

338338
@staticmethod
339-
def parse(client, message: types.Message or types.MessageService or types.MessageEmpty, users: dict, chats: dict,
339+
def _parse(client, message: types.Message or types.MessageService or types.MessageEmpty, users: dict, chats: dict,
340340
replies: int = 1):
341341
if isinstance(message, types.MessageEmpty):
342342
return Message(message_id=message.id, empty=True, client=client)
@@ -355,11 +355,11 @@ def parse(client, message: types.Message or types.MessageService or types.Messag
355355
new_chat_photo = None
356356

357357
if isinstance(action, types.MessageActionChatAddUser):
358-
new_chat_members = [User.parse(client, users[i]) for i in action.users]
358+
new_chat_members = [User._parse(client, users[i]) for i in action.users]
359359
elif isinstance(action, types.MessageActionChatJoinedByLink):
360-
new_chat_members = [User.parse(client, users[message.from_id])]
360+
new_chat_members = [User._parse(client, users[message.from_id])]
361361
elif isinstance(action, types.MessageActionChatDeleteUser):
362-
left_chat_member = User.parse(client, users[action.user_id])
362+
left_chat_member = User._parse(client, users[action.user_id])
363363
elif isinstance(action, types.MessageActionChatEditTitle):
364364
new_chat_title = action.title
365365
elif isinstance(action, types.MessageActionChatDeletePhoto):
@@ -373,13 +373,13 @@ def parse(client, message: types.Message or types.MessageService or types.Messag
373373
elif isinstance(action, types.MessageActionChannelCreate):
374374
channel_chat_created = True
375375
elif isinstance(action, types.MessageActionChatEditPhoto):
376-
new_chat_photo = Photo.parse(client, action.photo)
376+
new_chat_photo = Photo._parse(client, action.photo)
377377

378378
parsed_message = Message(
379379
message_id=message.id,
380380
date=message.date,
381-
chat=Chat.parse(client, message, users, chats),
382-
from_user=User.parse(client, users.get(message.from_id, None)),
381+
chat=Chat._parse(client, message, users, chats),
382+
from_user=User._parse(client, users.get(message.from_id, None)),
383383
service=True,
384384
new_chat_members=new_chat_members,
385385
left_chat_member=left_chat_member,
@@ -407,7 +407,7 @@ def parse(client, message: types.Message or types.MessageService or types.Messag
407407
return parsed_message
408408

409409
if isinstance(message, types.Message):
410-
entities = [MessageEntity.parse(client, entity, users) for entity in message.entities]
410+
entities = [MessageEntity._parse(client, entity, users) for entity in message.entities]
411411
entities = list(filter(lambda x: x is not None, entities))
412412

413413
forward_from = None
@@ -422,9 +422,9 @@ def parse(client, message: types.Message or types.MessageService or types.Messag
422422
forward_date = forward_header.date
423423

424424
if forward_header.from_id:
425-
forward_from = User.parse(client, users[forward_header.from_id])
425+
forward_from = User._parse(client, users[forward_header.from_id])
426426
else:
427-
forward_from_chat = Chat.parse_channel_chat(client, chats[forward_header.channel_id])
427+
forward_from_chat = Chat._parse_channel_chat(client, chats[forward_header.channel_id])
428428
forward_from_message_id = forward_header.channel_post
429429
forward_signature = forward_header.post_author
430430

@@ -445,13 +445,13 @@ def parse(client, message: types.Message or types.MessageService or types.Messag
445445

446446
if media:
447447
if isinstance(media, types.MessageMediaPhoto):
448-
photo = Photo.parse(client, media.photo)
448+
photo = Photo._parse(client, media.photo)
449449
elif isinstance(media, types.MessageMediaGeo):
450-
location = Location.parse(client, media.geo)
450+
location = Location._parse(client, media.geo)
451451
elif isinstance(media, types.MessageMediaContact):
452-
contact = Contact.parse(client, media)
452+
contact = Contact._parse(client, media)
453453
elif isinstance(media, types.MessageMediaVenue):
454-
venue = pyrogram.Venue.parse(client, media)
454+
venue = pyrogram.Venue._parse(client, media)
455455
elif isinstance(media, types.MessageMediaDocument):
456456
doc = media.document
457457

@@ -468,20 +468,20 @@ def parse(client, message: types.Message or types.MessageService or types.Messag
468468
audio_attributes = attributes[types.DocumentAttributeAudio]
469469

470470
if audio_attributes.voice:
471-
voice = pyrogram.Voice.parse(client, doc, audio_attributes)
471+
voice = pyrogram.Voice._parse(client, doc, audio_attributes)
472472
else:
473-
audio = pyrogram.Audio.parse(client, doc, audio_attributes, file_name)
473+
audio = pyrogram.Audio._parse(client, doc, audio_attributes, file_name)
474474
elif types.DocumentAttributeAnimated in attributes:
475475
video_attributes = attributes.get(types.DocumentAttributeVideo, None)
476476

477-
animation = pyrogram.Animation.parse(client, doc, video_attributes, file_name)
477+
animation = pyrogram.Animation._parse(client, doc, video_attributes, file_name)
478478
elif types.DocumentAttributeVideo in attributes:
479479
video_attributes = attributes[types.DocumentAttributeVideo]
480480

481481
if video_attributes.round_message:
482-
video_note = pyrogram.VideoNote.parse(client, doc, video_attributes)
482+
video_note = pyrogram.VideoNote._parse(client, doc, video_attributes)
483483
else:
484-
video = pyrogram.Video.parse(client, doc, video_attributes, file_name)
484+
video = pyrogram.Video._parse(client, doc, video_attributes, file_name)
485485
elif types.DocumentAttributeSticker in attributes:
486486
sticker = pyrogram.Sticker.parse(
487487
client, doc,
@@ -490,7 +490,7 @@ def parse(client, message: types.Message or types.MessageService or types.Messag
490490
file_name
491491
)
492492
else:
493-
document = pyrogram.Document.parse(client, doc, file_name)
493+
document = pyrogram.Document._parse(client, doc, file_name)
494494
elif isinstance(media, types.MessageMediaWebPage):
495495
web_page = True
496496
media = None
@@ -514,8 +514,8 @@ def parse(client, message: types.Message or types.MessageService or types.Messag
514514
parsed_message = Message(
515515
message_id=message.id,
516516
date=message.date,
517-
chat=Chat.parse(client, message, users, chats),
518-
from_user=User.parse(client, users.get(message.from_id, None)),
517+
chat=Chat._parse(client, message, users, chats),
518+
from_user=User._parse(client, users.get(message.from_id, None)),
519519
text=Str(message.message).init(client, entities) or None if media is None else None,
520520
caption=Str(message.message).init(client, entities) or None if media is not None else None,
521521
entities=entities or None if media is None else None,
@@ -543,7 +543,7 @@ def parse(client, message: types.Message or types.MessageService or types.Messag
543543
document=document,
544544
web_page=web_page,
545545
views=message.views,
546-
via_bot=User.parse(client, users.get(message.via_bot_id, None)),
546+
via_bot=User._parse(client, users.get(message.via_bot_id, None)),
547547
outgoing=message.out,
548548
reply_markup=reply_markup,
549549
client=client

pyrogram/client/types/messages_and_media/message_entity.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ def __init__(self,
7878
self.user = user
7979

8080
@staticmethod
81-
def parse(client, entity, users: dict) -> "MessageEntity" or None:
81+
def _parse(client, entity, users: dict) -> "MessageEntity" or None:
8282
type = MessageEntity.ENTITIES.get(entity.ID, None)
8383

8484
if type is None:
@@ -89,6 +89,6 @@ def parse(client, entity, users: dict) -> "MessageEntity" or None:
8989
offset=entity.offset,
9090
length=entity.length,
9191
url=getattr(entity, "url", None),
92-
user=User.parse(client, users.get(getattr(entity, "user_id", None), None)),
92+
user=User._parse(client, users.get(getattr(entity, "user_id", None), None)),
9393
client=client
9494
)

pyrogram/client/types/messages_and_media/messages.py

Lines changed: 3 additions & 3 deletions

0 commit comments

Comments
 (0)