Merge pull request python-telegram-bot#291 from python-telegram-bot/api-2016-05-06

jh0ker · jh0ker · commit 3ac9a1cd7180 · 2016-05-13T21:31:35.000+02:00
Api additions 2016-05-06
diff --git a/telegram/message.py b/telegram/message.py
@@ -39,6 +39,7 @@ class Message(TelegramObject):
         from_user (:class:`telegram.User`):
         date (:class:`datetime.datetime`):
         forward_from (:class:`telegram.User`):
+        forward_from_chat (:class:`telegram.Chat`):
         forward_date (:class:`datetime.datetime`):
         reply_to_message (:class:`telegram.Message`):
         text (str):
@@ -78,6 +79,7 @@ class Message(TelegramObject):
 
     Keyword Args:
         forward_from (Optional[:class:`telegram.User`]):
+        forward_from_chat (:class:`telegram.Chat`):
         forward_date (Optional[:class:`datetime.datetime`]):
         reply_to_message (Optional[:class:`telegram.Message`]):
         text (Optional[str]):
@@ -115,6 +117,7 @@ def __init__(self,
         self.chat = chat
         # Optionals
         self.forward_from = kwargs.get('forward_from')
+        self.forward_from_chat = kwargs.get('forward_from_chat')
         self.forward_date = kwargs.get('forward_date')
         self.reply_to_message = kwargs.get('reply_to_message')
         self.text = kwargs.get('text', '')
@@ -165,6 +168,7 @@ def de_json(data):
         data['chat'] = Chat.de_json(data.get('chat'))
         data['entities'] = MessageEntity.de_list(data.get('entities'))
         data['forward_from'] = User.de_json(data.get('forward_from'))
+        data['forward_from_chat'] = Chat.de_json(data.get('forward_from_chat'))
         data['forward_date'] = Message._fromtimestamp(data.get('forward_date'))
         data['reply_to_message'] = \
             Message.de_json(data.get('reply_to_message'))
diff --git a/telegram/sticker.py b/telegram/sticker.py
@@ -30,6 +30,7 @@ class Sticker(TelegramObject):
         width (int):
         height (int):
         thumb (:class:`telegram.PhotoSize`):
+        emoji (str):
         file_size (int):
 
     Args:
@@ -40,6 +41,7 @@ class Sticker(TelegramObject):
 
     Keyword Args:
         thumb (Optional[:class:`telegram.PhotoSize`]):
+        emoji (Optional[str]):
         file_size (Optional[int]):
     """
 
@@ -54,6 +56,7 @@ def __init__(self,
         self.height = int(height)
         # Optionals
         self.thumb = kwargs.get('thumb')
+        self.emoji = kwargs.get('emoji', '')
         self.file_size = int(kwargs.get('file_size', 0))
 
     @staticmethod
diff --git a/tests/test_sticker.py b/tests/test_sticker.py
@@ -23,6 +23,7 @@
 import os
 
 from flaky import flaky
+from future.utils import PY2
 
 sys.path.append('.')
 
@@ -41,13 +42,15 @@ def setUp(self):
                       'height': 90,
                       'file_id': 'BQADAQADoQADHyP1B0mzJMVyzcB0Ag',
                       'file_size': 2364}
+        self.emoji = telegram.Emoji.FLEXED_BICEPS
         self.file_size = 39518
 
         self.json_dict = {
             'file_id': self.sticker_file_id,
             'width': self.width,
             'height': self.height,
             'thumb': self.thumb,
+            'emoji': self.emoji,
             'file_size': self.file_size
         }
 
@@ -68,6 +71,10 @@ def test_send_sticker_resend(self):
         self.assertEqual(sticker.width, self.width)
         self.assertEqual(sticker.height, self.height)
         self.assertTrue(isinstance(sticker.thumb, telegram.PhotoSize))
+        if PY2:
+            self.assertEqual(sticker.emoji, self.emoji.decode('utf-8'))
+        else:
+            self.assertEqual(sticker.emoji, self.emoji)
         self.assertEqual(sticker.file_size, self.file_size)
 
     def test_sticker_de_json(self):
@@ -77,6 +84,7 @@ def test_sticker_de_json(self):
         self.assertEqual(sticker.width, self.width)
         self.assertEqual(sticker.height, self.height)
         self.assertTrue(isinstance(sticker.thumb, telegram.PhotoSize))
+        self.assertEqual(sticker.emoji, self.emoji)
         self.assertEqual(sticker.file_size, self.file_size)
 
     def test_sticker_to_json(self):
@@ -91,6 +99,7 @@ def test_sticker_to_dict(self):
         self.assertEqual(sticker['width'], self.width)
         self.assertEqual(sticker['height'], self.height)
         self.assertTrue(isinstance(sticker['thumb'], telegram.PhotoSize))
+        self.assertEqual(sticker['emoji'], self.emoji)
         self.assertEqual(sticker['file_size'], self.file_size)
 
     @flaky(3, 1)
