python/aiogram
1
0
Fork 0
mirror of https://github.com/aiogram/aiogram.git synced 2025-12-12 02:03:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add content type detection in message object

Browse source
This commit is contained in:
Alex Root Junior 2017-05-21 17:31:37 +03:00
parent 4f7bdfa885
commit 4078d555a4
1 changed files with 50 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

53
aiogram/types/message.py
View file

@ -13,14 +13,14 @@ class Message(Deserializable):
'sticker', 'video', 'voice', 'video_note', 'new_chat_members', 'caption', 'contact', 'location', 'venue', 'sticker', 'video', 'voice', 'video_note', 'new_chat_members', 'caption', 'contact', 'location', 'venue',
'new_chat_member', 'left_chat_member', 'new_chat_title', 'new_chat_photo', 'delete_chat_photo', 'new_chat_member', 'left_chat_member', 'new_chat_title', 'new_chat_photo', 'delete_chat_photo',
'group_chat_created', 'supergroup_chat_created', 'channel_chat_created', 'migrate_to_chat_id', 'group_chat_created', 'supergroup_chat_created', 'channel_chat_created', 'migrate_to_chat_id',
'migrate_from_chat_id', 'pinned_message', 'invoice', 'successful_payment') 'migrate_from_chat_id', 'pinned_message', 'invoice', 'successful_payment', 'content_type')
def __init__(self, data, message_id, from_user, date, chat, forward_from, forward_from_chat, def __init__(self, data, message_id, from_user, date, chat, forward_from, forward_from_chat,
forward_from_message_id, forward_date, reply_to_message, edit_date, text, entities, audio, document, forward_from_message_id, forward_date, reply_to_message, edit_date, text, entities, audio, document,
game, photo, sticker, video, voice, video_note, new_chat_members, caption, contact, location, venue, game, photo, sticker, video, voice, video_note, new_chat_members, caption, contact, location, venue,
new_chat_member, left_chat_member, new_chat_title, new_chat_photo, delete_chat_photo, new_chat_member, left_chat_member, new_chat_title, new_chat_photo, delete_chat_photo,
group_chat_created, supergroup_chat_created, channel_chat_created, migrate_to_chat_id, group_chat_created, supergroup_chat_created, channel_chat_created, migrate_to_chat_id,
migrate_from_chat_id, pinned_message, invoice, successful_payment): migrate_from_chat_id, pinned_message, invoice, successful_payment, content_type):
self.data = data self.data = data
self.message_id: int = message_id self.message_id: int = message_id
@ -63,6 +63,8 @@ class Message(Deserializable):
self.invoice = invoice self.invoice = invoice
self.successful_payment = successful_payment self.successful_payment = successful_payment
self.content_type = content_type
@classmethod @classmethod
def _parse_date(cls, unix_time): def _parse_date(cls, unix_time):
return datetime.datetime.fromtimestamp(unix_time) return datetime.datetime.fromtimestamp(unix_time)
@ -127,12 +129,57 @@ class Message(Deserializable):
invoice = data.get('invoice') invoice = data.get('invoice')
successful_payment = data.get('successful_payment') successful_payment = data.get('successful_payment')
if text:
content_type = ContentType.TEXT
elif audio:
content_type = ContentType.AUDIO
elif document:
content_type = ContentType.DOCUMENT
elif game:
content_type = ContentType.GAME
elif photo:
content_type = ContentType.PHOTO
elif sticker:
content_type = ContentType.STICKER
elif video:
content_type = ContentType.VIDEO
elif voice:
content_type = ContentType.VOICE
elif new_chat_member or new_chat_members:
content_type = ContentType.NEW_CHAT_MEMBERS
elif left_chat_member:
content_type = ContentType.LEFT_CHAT_MEMBER
elif invoice:
content_type = ContentType.INVOICE
elif successful_payment:
content_type = ContentType.SUCCESSFUL_PAYMENT
else:
content_type = ContentType.UNKNOWN
return Message(data, message_id, from_user, date, chat, forward_from, forward_from_chat, return Message(data, message_id, from_user, date, chat, forward_from, forward_from_chat,
forward_from_message_id, forward_date, reply_to_message, edit_date, text, entities, audio, forward_from_message_id, forward_date, reply_to_message, edit_date, text, entities, audio,
document, game, photo, sticker, video, voice, video_note, new_chat_members, caption, contact, document, game, photo, sticker, video, voice, video_note, new_chat_members, caption, contact,
location, venue, new_chat_member, left_chat_member, new_chat_title, new_chat_photo, location, venue, new_chat_member, left_chat_member, new_chat_title, new_chat_photo,
delete_chat_photo, group_chat_created, supergroup_chat_created, channel_chat_created, delete_chat_photo, group_chat_created, supergroup_chat_created, channel_chat_created,
migrate_to_chat_id, migrate_from_chat_id, pinned_message, invoice, successful_payment) migrate_to_chat_id, migrate_from_chat_id, pinned_message, invoice, successful_payment,
content_type)
def is_command(self): def is_command(self):
return self.text and self.text.startswith('/') return self.text and self.text.startswith('/')
class ContentType:
TEXT = 'text'
AUDIO = 'audio'
DOCUMENT = 'document'
GAME = 'game'
PHOTO = 'photo'
STICKER = 'sticker'
VIDEO = 'video'
VOICE = 'voice'
NEW_CHAT_MEMBERS = 'new_chat_members'
LEFT_CHAT_MEMBER = 'left_chat_member'
INVOICE = 'invoice'
SUCCESSFUL_PAYMENT = 'successful_payment'
UNKNOWN = 'unknown'