Minor lost fixes for to_dict and other methods

Author: Badiboy

telebot/types.py

@@ -983,7 +983,8 @@ def can_send_gift(self) -> bool:
         return False
 
 
-class Chat(ChatFullInfo):
+# noinspection PyShadowingBuiltins
+class Chat(JsonDeserializable):
     """
     This object represents a chat.
 
@@ -1022,6 +1023,17 @@ def de_json(cls, json_string):
         obj = cls.check_json(json_string, dict_copy=False)
         return cls(**obj)
 
+    def __init__(self, id: int, type: str, title: Optional[str]=None, username: Optional[str]=None,
+                 first_name: Optional[str]=None, last_name: Optional[str]=None,
+                 is_forum: Optional[bool]=None, is_direct_messages: Optional[bool]=None, **kwargs) -> None:
+        self.id: int = id
+        self.type: str = type
+        self.title: Optional[str] = title
+        self.username: Optional[str] = username
+        self.first_name: Optional[str] = first_name
+        self.last_name: Optional[str] = last_name
+        self.is_forum: Optional[bool] = is_forum
+        self.is_direct_messages: Optional[bool] = is_direct_messages
 
 
 class MessageID(JsonDeserializable, ABC):
@@ -2951,6 +2963,8 @@ def to_dict(self) -> dict:
             data['input_field_placeholder'] = self.input_field_placeholder
         if self.is_persistent is not None:
             data['is_persistent'] = self.is_persistent
+        if self.force_reply is not None:
+            data['force_reply'] = self.force_reply
         return data
 
     def to_json(self):
@@ -3136,7 +3150,6 @@ def to_dict(self) -> dict:
         return data
 
 
-
 class KeyboardButton(Dictionaryable, JsonSerializable):
     """
     This object represents one button of the reply keyboard. At most one of the fields other than text, icon_custom_emoji_id, and style must be used to specify the type of the button. For simple text buttons, String can be used instead of this object to specify the button text.
@@ -3353,6 +3366,8 @@ def to_dict(self) -> dict:
         data = {
             'inline_keyboard': [[button.to_dict() for button in row] for row in self.inline_keyboard],
         }
+        if self.force_reply is not None:
+            data['force_reply'] = self.force_reply
         return data
 
     @property
@@ -3361,8 +3376,6 @@ def keyboard(self):
         return self.inline_keyboard
 
 
-
-
 class InlineKeyboardButton(Dictionaryable, JsonSerializable, JsonDeserializable):
     """
     This object represents one button of an inline keyboard. Exactly one of the fields other than text, icon_custom_emoji_id, and style must be used to specify the type of the button.
@@ -3393,8 +3406,7 @@ class InlineKeyboardButton(Dictionaryable, JsonSerializable, JsonDeserializable)
     :param switch_inline_query: Optional. If set, pressing the button will prompt the user to select one of their chats, open that chat and insert the bot's username and the specified inline query in the input field. May be empty, in which case just the bot's username will be inserted. Not supported for messages sent in channel direct messages chats and on behalf of a business account.
     :type switch_inline_query: :obj:`str`
 
-    :param switch_inline_query_current_chat: Optional. If set, pressing the button will insert the bot's username and the specified inline query in the current chat's input field. May be empty, in which case only the bot's username will be inserted.
-This offers a quick way for the user to open your bot in inline mode in the same chat - good for selecting something from multiple options. Not supported in channels and for messages sent in channel direct messages chats and on behalf of a business account.
+    :param switch_inline_query_current_chat: Optional. If set, pressing the button will insert the bot's username and the specified inline query in the current chat's input field. May be empty, in which case only the bot's username will be inserted. This offers a quick way for the user to open your bot in inline mode in the same chat - good for selecting something from multiple options. Not supported in channels and for messages sent in channel direct messages chats and on behalf of a business account.
     :type switch_inline_query_current_chat: :obj:`str`
 
     :param switch_inline_query_chosen_chat: Optional. If set, pressing the button will prompt the user to select one of their chats of the specified type, open that chat and insert the bot's username and the specified inline query in the input field. Not supported for messages sent in channel direct messages chats and on behalf of a business account.
@@ -3427,6 +3439,10 @@ def de_json(cls, json_string):
             obj['switch_inline_query_chosen_chat'] = SwitchInlineQueryChosenChat.de_json(obj.get('switch_inline_query_chosen_chat'))
         if 'copy_text' in obj:
             obj['copy_text'] = CopyTextButton.de_json(obj.get('copy_text'))
+        if 'disabled' in obj:
+            obj['disabled'] = DisabledButton.de_json(obj.get('disabled'))
+        if 'callback_game' in obj:
+            obj['callback_game'] = CallbackGame.de_json(obj.get('callback_game'))
 
         return cls(**obj)
 
@@ -3470,7 +3486,7 @@ def to_dict(self) -> dict:
         if self.switch_inline_query_current_chat is not None:
             data['switch_inline_query_current_chat'] = self.switch_inline_query_current_chat
         if self.callback_game is not None:
-            data['callback_game'] = self.callback_game
+            data['callback_game'] = self.callback_game.to_dict()
         if self.pay is not None:
             data['pay'] = self.pay
         if self.login_url is not None:
@@ -3483,6 +3499,8 @@ def to_dict(self) -> dict:
             data['icon_custom_emoji_id'] = self.icon_custom_emoji_id
         if self.style is not None:
             data['style'] = self.style
+        if self.disabled is not None:
+            data['disabled'] = self.disabled.to_dict()
         return data
 
 
@@ -5554,6 +5572,8 @@ def to_dict(self) -> dict:
         data['video_url'] = self.video_url
         data['mime_type'] = self.mime_type
         data['thumbnail_url'] = self.thumbnail_url
+        if self.video_width is not None:
+            data['video_width'] = self.video_width
         if self.video_height is not None:
             data['video_height'] = self.video_height
         if self.video_duration is not None:
@@ -5623,9 +5643,9 @@ def __init__(self, id: str, audio_url: str, title: str,
     def to_dict(self) -> dict:
         data = super().to_dict()
         data['audio_url'] = self.audio_url
-        if self.performer:
+        if self.performer is not None:
             data['performer'] = self.performer
-        if self.audio_duration:
+        if self.audio_duration is not None:
             data['audio_duration'] = self.audio_duration
         return data
 
@@ -5687,7 +5707,7 @@ def __init__(self, id: str, voice_url: str, title: str,
     def to_dict(self) -> dict:
         data = super().to_dict()
         data['voice_url'] = self.voice_url
-        if self.voice_duration:
+        if self.voice_duration is not None:
             data['voice_duration'] = self.voice_duration
         return data
 
@@ -8234,7 +8254,6 @@ def to_dict(self) -> dict:
         return data
 
 
-
 class ChatLocation(JsonSerializable, JsonDeserializable, Dictionaryable):
     """
     Represents a location to which a chat is connected.
@@ -8359,6 +8378,10 @@ def to_dict(self) -> dict:
             data["pending_join_request_count"] = self.pending_join_request_count
         if self.name is not None:
             data["name"] = self.name
+        if self.subscription_period is not None:
+            data["subscription_period"] = self.subscription_period
+        if self.subscription_price is not None:
+            data["subscription_price"] = self.subscription_price
         return data
 
 
@@ -8384,6 +8407,8 @@ class ProximityAlertTriggered(JsonDeserializable):
     def de_json(cls, json_string):
         if json_string is None: return None
         obj = cls.check_json(json_string, dict_copy=False)
+        obj['traveler'] = User.de_json(obj.get('traveler'))
+        obj['watcher'] = User.de_json(obj.get('watcher'))
         return cls(**obj)
 
     def __init__(self, traveler: User, watcher: User, distance: int, **kwargs):
@@ -8487,7 +8512,6 @@ def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
 
-
 class VideoChatParticipantsInvited(JsonDeserializable):
     """
     This object represents a service message about new members invited to a video chat.
@@ -8641,6 +8665,7 @@ def to_dict(self) -> dict:
     def de_json(cls, json_string):
         if json_string is None: return None
         obj = cls.check_json(json_string)
+        obj['web_app'] = WebAppInfo.de_json(obj.get('web_app'))
         return cls(**obj)
 
 
@@ -8803,7 +8828,6 @@ def to_json(self):
         return json.dumps(self.to_dict())
 
 
-
 class InputFile:
     """
     A class to send files through Telegram Bot API.
@@ -8994,7 +9018,6 @@ def __init__(self) -> None:
         pass
 
 
-
 class ForumTopic(JsonDeserializable):
     """
     This object represents a forum topic.
@@ -9215,7 +9238,6 @@ def convert_input_sticker(self) -> Tuple[str, Optional[dict]]:
         return self.to_json(), {self._sticker_name: self.sticker}
 
 
-
 class SwitchInlineQueryChosenChat(JsonDeserializable, Dictionaryable, JsonSerializable):
     """
     This object represents an inline button that switches the current user to inline mode in a chosen chat, with an optional default inline query.
@@ -9559,7 +9581,6 @@ def __init__(self, chat: Chat, message_id: int, date: int,
         self.new_reaction: List[ReactionType] = new_reaction
 
 
-
 class MessageReactionCountUpdated(JsonDeserializable):
     """
     This object represents reaction changes on a message with anonymous reactions.
@@ -10824,7 +10845,6 @@ def can_reply(self) -> bool:
         return self.rights is not None and self.rights.can_reply
 
 
-
 class BusinessMessagesDeleted(JsonDeserializable):
     """
     This object is received when messages are deleted from a connected business account.
@@ -12026,7 +12046,6 @@ def to_dict(self) -> dict:
         return data
 
 
-
 class InputPaidMediaVideo(InputPaidMedia):
     """
     The paid media to send is a video.
@@ -17727,6 +17746,8 @@ def to_dict(self) -> dict:
             data['is_bordered'] = self.is_bordered
         if self.is_striped is not None:
             data['is_striped'] = self.is_striped
+        if self.is_compact is not None:
+            data['is_compact'] = self.is_compact
         if self.caption is not None:
             data['caption'] = RichText.richtext_to_dict(self.caption)
         return data
@@ -18036,7 +18057,7 @@ def to_dict(self) -> dict:
         if hasattr(self, 'document'):
             data['document'] = self.document.to_dict() if hasattr(self.document, 'to_dict') else self.document
         if self.caption is not None:
-            data['caption'] = RichBlockCaption.to_dict(self.caption) if hasattr(self.caption, 'to_dict') else self.caption
+            data['caption'] = self.caption.to_dict()
         return data
 
 

telebot/util.py

@@ -44,7 +44,8 @@
     'checklist_tasks_done', 'checklist_tasks_added', 'direct_message_price_changed', 'suggested_post_refunded',
     'suggested_post_info', 'suggested_post_approved', 'suggested_post_approval_failed', 'suggested_post_declined',
     'suggested_post_paid', 'gift_upgrade_sent', 'chat_owner_left', 'chat_owner_changed', 'managed_bot_created',
-    'poll_option_added', 'poll_option_deleted', 'community_chat_added', 'community_chat_removed'
+    'poll_option_added', 'poll_option_deleted', 'community_chat_added', 'community_chat_removed',
+    'community_chat_joined'
 ]
 
 #: All update types, should be used for allowed_updates parameter in polling.

tests/test_types.py

@@ -837,7 +837,7 @@ def test_json_inlinekeyboardbutton():
     assert result.switch_inline_query == 'query'
     assert result.switch_inline_query_current_chat == 'query'
     assert isinstance(result.switch_inline_query_chosen_chat, types.SwitchInlineQueryChosenChat)
-    assert isinstance(result.callback_game, dict)
+    assert isinstance(result.callback_game, types.CallbackGame)
     assert result.pay == True
     assert isinstance(result.login_url, types.LoginUrl)
     assert isinstance(result.copy_text, types.CopyTextButton)
@@ -865,7 +865,7 @@ def test_json_menubuttonwebapp():
     assert isinstance(result, types.MenuButtonWebApp)
     assert result.type == 'web_app'
     assert result.text == 'Open App'
-    assert isinstance(result.web_app, dict)
+    assert isinstance(result.web_app, types.WebAppInfo)
 
 
 def test_json_pollanswer():
@@ -2143,8 +2143,8 @@ def test_json_proximityalerttriggered():
     json_str = r'{"traveler": {"id": 1, "is_bot": false, "first_name": "Test"}, "watcher": {"id": 1, "is_bot": false, "first_name": "Test"}, "distance": "test"}'
     result = types.ProximityAlertTriggered.de_json(json_str)
     assert isinstance(result, types.ProximityAlertTriggered)
-    assert isinstance(result.traveler, dict)
-    assert isinstance(result.watcher, dict)
+    assert isinstance(result.traveler, types.User)
+    assert isinstance(result.watcher, types.User)
     assert result.distance == 'test'