fix: [chat feeder] message id of pdf and image, the channel ID was added to the global message ID. fix invalid chat correlation + image/pdf not linked in the same message in the UI

Author: Terrtia

bin/importer/feeders/abstract_chats_feeder.py

@@ -425,9 +425,8 @@ def process_meta(self):  # TODO CHECK MANDATORY FIELDS
         else:  # IMAGE + ITEM
             chat_id = self.get_chat_id()
             thread_id = self.get_thread_id()
-            channel_id = self.get_subchannel_id()
             message_id = self.get_message_id()
-            message_id = Messages.create_obj_id(self.get_chat_instance_uuid(), chat_id, message_id, timestamp, channel_id=channel_id, thread_id=thread_id)
+            message_id = Messages.create_obj_id(self.get_chat_instance_uuid(), chat_id, message_id, timestamp, thread_id=thread_id)
             message = Messages.Message(message_id)
             # create empty message if message don't exist
             if not message.exists():

bin/lib/objects/Messages.py

@@ -454,13 +454,9 @@ def create(self, content, language=None, translation=None, tags=[]):
     def delete(self):
         pass
 
-def create_obj_id(chat_instance, chat_id, message_id, timestamp, channel_id=None, thread_id=None): # TODO CHECK COLLISIONS
+def create_obj_id(chat_instance, chat_id, message_id, timestamp, thread_id=None):
     timestamp = int(timestamp)
-    if channel_id and thread_id:
-        return f'{chat_instance}/{timestamp}/{chat_id}/{thread_id}/{message_id}'
-    elif channel_id:
-        return f'{chat_instance}/{timestamp}/{channel_id}/{chat_id}/{message_id}'
-    elif thread_id:
+    if thread_id:
         return f'{chat_instance}/{timestamp}/{chat_id}/{thread_id}/{message_id}'
     else:
         return f'{chat_instance}/{timestamp}/{chat_id}/{message_id}'