Merge pull request #46 from rahiel/master

add remaining chat actions
python-telegram-bot · Aug 25, 2015 · e239315 · e239315
2 parents 2f99b78 + ccdb999
commit e239315
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/telegram/bot.py b/telegram/bot.py
@@ -530,8 +530,8 @@ def sendChatAction(self,
             is about to receive:
             - ChatAction.TYPING for text messages,
             - ChatAction.UPLOAD_PHOTO for photos,
-            - ChatAction.UPLOAD_VIDEO or upload_video for videos,
-            - ChatAction.UPLOAD_AUDIO or upload_audio for audio files,
+            - ChatAction.UPLOAD_VIDEO for videos,
+            - ChatAction.UPLOAD_AUDIO for audio files,
             - ChatAction.UPLOAD_DOCUMENT for general files,
             - ChatAction.FIND_LOCATION for location data.
         """

diff --git a/telegram/chataction.py b/telegram/chataction.py
@@ -20,7 +20,9 @@
 class ChatAction(object):
     TYPING = 'typing'
     UPLOAD_PHOTO = 'upload_photo'
-    RECORD_VIDEO = 'upload_video'
-    RECORD_AUDIO = 'upload_audio'
+    RECORD_VIDEO = 'record_video'
+    UPLOAD_VIDEO = 'upload_video'
+    RECORD_AUDIO = 'record_audio'
+    UPLOAD_AUDIO = 'upload_audio'
     UPLOAD_DOCUMENT = 'upload_document'
     FIND_LOCATION = 'find_location'