OpenSource/python-telegram-bot
OpenSource/python-telegram-bot
1
0
Fork 0
mirror of https://github.com/python-telegram-bot/python-telegram-bot.git synced 2025-02-16 18:31:45 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #91 from jh0ker/useroptional

Browse source 
Make user_from optional to work with channels channels
This commit is contained in:
Leandro Toledo 2015-11-04 09:52:00 -02:00
commit d3d5c1e907
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
telegram/message.py
View file

@ -134,7 +134,7 @@ class Message(TelegramObject):
if not data: if not data:
return None return None
data['from_user'] = User.de_json(data['from']) data['from_user'] = User.de_json(data.get('from'))
data['date'] = datetime.fromtimestamp(data['date']) data['date'] = datetime.fromtimestamp(data['date'])
if 'first_name' in data.get('chat', ''): if 'first_name' in data.get('chat', ''):
data['chat'] = User.de_json(data.get('chat')) data['chat'] = User.de_json(data.get('chat'))
@ -185,7 +185,7 @@ class Message(TelegramObject):
data = super(Message, self).to_dict() data = super(Message, self).to_dict()
# Required # Required
data['from'] = data.pop('from_user') data['from'] = data.pop('from_user', None)
data['date'] = self._totimestamp(self.date) data['date'] = self._totimestamp(self.date)
# Optionals # Optionals
if self.forward_date: if self.forward_date: