Merge pull request eternnoir#2240 from YouKnow-sys/master

Update to resolve Issue with outdated `_convert_entities` function in `copy_message` method

Author: Badiboy

telebot/apihelper.py

@@ -432,7 +432,7 @@ def copy_message(token, chat_id, from_chat_id, message_id, caption=None, parse_m
     if parse_mode:
         payload['parse_mode'] = parse_mode
     if caption_entities is not None:
-        payload['caption_entities'] = _convert_entites(caption_entities)
+        payload['caption_entities'] = json.dumps(types.MessageEntity.to_list_of_dicts(caption_entities))
     if disable_notification is not None:
         payload['disable_notification'] = disable_notification
     if reply_parameters is not None:
@@ -1998,17 +1998,6 @@ def _convert_markup(markup):
     return markup
 
 
-def _convert_entites(entites):
-    if entites is None:
-        return None
-    elif len(entites) == 0:
-        return []
-    elif isinstance(entites[0], types.JsonSerializable):
-        return [entity.to_json() for entity in entites]
-    else:
-        return entites
-
-
 def _convert_poll_options(poll_options):
     if poll_options is None:
         return None

telebot/asyncio_helper.py

@@ -422,7 +422,7 @@ async def copy_message(token, chat_id, from_chat_id, message_id, caption=None, p
     if parse_mode:
         payload['parse_mode'] = parse_mode
     if caption_entities is not None:
-        payload['caption_entities'] = await _convert_entites(caption_entities)
+        payload['caption_entities'] = json.dumps(types.MessageEntity.to_list_of_dicts(caption_entities))
     if disable_notification is not None:
         payload['disable_notification'] = disable_notification
     if reply_parameters is not None:
@@ -1975,18 +1975,6 @@ async def _convert_list_json_serializable(results):
     return '[' + ret + ']'
 
 
-
-async def _convert_entites(entites):
-    if entites is None:
-        return None
-    elif len(entites) == 0:
-        return []
-    elif isinstance(entites[0], types.JsonSerializable):
-        return [entity.to_json() for entity in entites]
-    else:
-        return entites
-
-
 async def _convert_poll_options(poll_options):
     if poll_options is None:
         return None

telebot/types.py

@@ -1612,10 +1612,12 @@ def to_list_of_dicts(entity_list) -> Union[List[Dict], None]:
         """
         Converts a list of MessageEntity objects to a list of dictionaries.
         """
-        res = []
-        for e in entity_list:
-            res.append(MessageEntity.to_dict(e))
-        return res or None
+        if entity_list is None or len(entity_list) == 0:
+            return None
+        elif isinstance(entity_list[0], MessageEntity):
+            return [MessageEntity.to_dict(e) for e in entity_list]
+        else:
+            return entity_list
 
     @classmethod
     def de_json(cls, json_string):