From a6d35fd1de869b72814c320e8bcceb6a639463b2 Mon Sep 17 00:00:00 2001
From: eternnoir <eternnoir@gmail.com>
Date: Thu, 14 Apr 2016 17:09:12 +0800
Subject: [PATCH] Add all inquery types.

---
 telebot/types.py    | 25 +++++++++++++++++++++++++
 tests/test_types.py | 31 +++++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+)

diff --git a/telebot/types.py b/telebot/types.py
index 9503c31..3d8b045 100644
--- a/telebot/types.py
+++ b/telebot/types.py
@@ -644,6 +644,10 @@ class InlineKeyboardMarkup(Dictionaryable, JsonSerializable):
         json_dict = {'inline_keyboard': self.keyboard}
         return json.dumps(json_dict)
 
+    def to_dic(self):
+        json_dict = {'inline_keyboard': self.keyboard}
+        return json_dict
+
 
 class InlineKeyboardButton(JsonSerializable):
     def __init__(self, text, url=None, callback_data=None, switch_inline_query=None):
@@ -1245,6 +1249,7 @@ class BaseInlineQueryResultCached(JsonSerializable):
 class InlineQueryResultCachedPhoto(BaseInlineQueryResultCached):
     def __init__(self, id, photo_file_id, title=None, description=None, caption=None, reply_markup=None,
                  input_message_content=None):
+        BaseInlineQueryResultCached.__init__(self)
         self.type = 'photo'
         self.id = id
         self.photo_file_id = photo_file_id
@@ -1259,6 +1264,7 @@ class InlineQueryResultCachedPhoto(BaseInlineQueryResultCached):
 class InlineQueryResultCachedGif(BaseInlineQueryResultCached):
     def __init__(self, id, gif_file_id, title=None, description=None, caption=None, reply_markup=None,
                  input_message_content=None):
+        BaseInlineQueryResultCached.__init__(self)
         self.type = 'gif'
         self.id = id
         self.gif_file_id = gif_file_id
@@ -1270,8 +1276,23 @@ class InlineQueryResultCachedGif(BaseInlineQueryResultCached):
         self.payload_dic['gif_file_id'] = gif_file_id
 
 
+class InlineQueryResultCachedMpeg4Gif(BaseInlineQueryResultCached):
+    def __init__(self, id, mpeg4_file_id, title=None, description=None, caption=None, reply_markup=None,
+                 input_message_content=None):
+        BaseInlineQueryResultCached.__init__(self)
+        self.type = 'mpeg4_gif'
+        self.id = id
+        self.mpeg4_file_id = mpeg4_file_id
+        self.title = title
+        self.description = description
+        self.caption = caption
+        self.reply_markup = reply_markup
+        self.input_message_content = input_message_content
+        self.payload_dic['mpeg4_file_id'] = mpeg4_file_id
+
 class InlineQueryResultCachedSticker(BaseInlineQueryResultCached):
     def __init__(self, id, sticker_file_id, reply_markup=None, input_message_content=None):
+        BaseInlineQueryResultCached.__init__(self)
         self.type = 'sticker'
         self.id = id
         self.sticker_file_id = sticker_file_id
@@ -1283,6 +1304,7 @@ class InlineQueryResultCachedSticker(BaseInlineQueryResultCached):
 class InlineQueryResultCachedDocument(BaseInlineQueryResultCached):
     def __init__(self, id, document_file_id, title, description=None, caption=None, reply_markup=None,
                  input_message_content=None):
+        BaseInlineQueryResultCached.__init__(self)
         self.type = 'document'
         self.id = id
         self.document_file_id = document_file_id
@@ -1297,6 +1319,7 @@ class InlineQueryResultCachedDocument(BaseInlineQueryResultCached):
 class InlineQueryResultCachedVideo(BaseInlineQueryResultCached):
     def __init__(self, id, video_file_id, title, description=None, caption=None, reply_markup=None,
                  input_message_content=None):
+        BaseInlineQueryResultCached.__init__(self)
         self.type = 'video'
         self.id = id
         self.video_file_id = video_file_id
@@ -1310,6 +1333,7 @@ class InlineQueryResultCachedVideo(BaseInlineQueryResultCached):
 
 class InlineQueryResultCachedVoice(BaseInlineQueryResultCached):
     def __init__(self, id, voice_file_id, title, reply_markup=None, input_message_content=None):
+        BaseInlineQueryResultCached.__init__(self)
         self.type = 'voice'
         self.id = id
         self.voice_file_id = voice_file_id
@@ -1321,6 +1345,7 @@ class InlineQueryResultCachedVoice(BaseInlineQueryResultCached):
 
 class InlineQueryResultCachedAudio(BaseInlineQueryResultCached):
     def __init__(self, id, audio_file_id, reply_markup=None, input_message_content=None):
+        BaseInlineQueryResultCached.__init__(self)
         self.type = 'audio'
         self.id = id
         self.audio_file_id = audio_file_id
diff --git a/tests/test_types.py b/tests/test_types.py
index a77a873..2166a7f 100644
--- a/tests/test_types.py
+++ b/tests/test_types.py
@@ -127,3 +127,34 @@ def test_json_chat():
     assert chat.type == 'group'
     assert chat.title == 'Test Title'
 
+def test_InlineQueryResultCachedPhoto():
+    iq = types.InlineQueryResultCachedPhoto('aaa', 'Fileid')
+    json_str = iq.to_json()
+    assert 'aa' in json_str
+    assert 'Fileid' in json_str
+    assert 'caption' not in json_str
+
+
+def test_InlineQueryResultCachedPhoto_with_title():
+    iq = types.InlineQueryResultCachedPhoto('aaa', 'Fileid', title='Title')
+    json_str = iq.to_json()
+    assert 'aa' in json_str
+    assert 'Fileid' in json_str
+    assert 'Title' in json_str
+    assert 'caption' not in json_str
+
+def test_InlineQueryResultCachedPhoto_with_markup():
+    markup = types.InlineKeyboardMarkup()
+    markup.add(types.InlineKeyboardButton("Google", url="http://www.google.com"))
+    markup.add(types.InlineKeyboardButton("Yahoo", url="http://www.yahoo.com"))
+    iq = types.InlineQueryResultCachedPhoto('aaa', 'Fileid', title='Title', reply_markup=markup)
+    json_str = iq.to_json()
+    assert 'aa' in json_str
+    assert 'Fileid' in json_str
+    assert 'Title' in json_str
+    assert 'caption' not in json_str
+    assert 'reply_markup' not in json_str
+
+
+test_InlineQueryResultCachedPhoto_with_markup()
+