Merge remote-tracking branch 'origin/bot-api-4.0' into bot-api-4.0

jsmnbom · jsmnbom · commit e0768bc500eb · 2018-08-12T17:53:51.000+02:00
diff --git a/telegram/messageentity.py b/telegram/messageentity.py
@@ -81,6 +81,10 @@ def de_list(cls, data, bot):
     """:obj:`str`: 'mention'"""
     HASHTAG = 'hashtag'
     """:obj:`str`: 'hashtag'"""
+    CASHTAG = 'cashtag'
+    """:obj:`str`: 'cashtag'"""
+    PHONE_NUMBER = 'phone_number'
+    """:obj:`str`: 'phone_number'"""
     BOT_COMMAND = 'bot_command'
     """:obj:`str`: 'bot_command'"""
     URL = 'url'
@@ -100,6 +104,7 @@ def de_list(cls, data, bot):
     TEXT_MENTION = 'text_mention'
     """:obj:`str`: 'text_mention'"""
     ALL_TYPES = [
-        MENTION, HASHTAG, BOT_COMMAND, URL, EMAIL, BOLD, ITALIC, CODE, PRE, TEXT_LINK, TEXT_MENTION
+        MENTION, HASHTAG, CASHTAG, PHONE_NUMBER, BOT_COMMAND, URL,
+        EMAIL, BOLD, ITALIC, CODE, PRE, TEXT_LINK, TEXT_MENTION
     ]
     """List[:obj:`str`]: List of all the types."""
