leadguru-jobs 0.421.0__tar.gz → 0.423.0__tar.gz

{leadguru_jobs-0.421.0 → leadguru_jobs-0.423.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: leadguru_jobs
-Version: 0.421.0
+Version: 0.423.0
 Summary: LGT jobs builds
 Author-email: developer@leadguru.co
 Classifier: Development Status :: 5 - Production/Stable

{leadguru_jobs-0.421.0 → leadguru_jobs-0.423.0}/leadguru_jobs.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: leadguru_jobs
-Version: 0.421.0
+Version: 0.423.0
 Summary: LGT jobs builds
 Author-email: developer@leadguru.co
 Classifier: Development Status :: 5 - Production/Stable

{leadguru_jobs-0.421.0 → leadguru_jobs-0.423.0}/lgt_jobs/jobs/chat_history.py

@@ -67,7 +67,7 @@ class LoadChatHistoryJob(BaseBackgroundJob, ABC):
         messages = chat_repo.get_list(sender_id=contact.sender_id, bot_id=bot.id)
         new_messages = []
         for message in slack_chat:
-            same_messages = [msg for msg in messages if msg.ts == message.ts]
+            same_messages = [msg for msg in messages if msg.id == message.id]
             if not same_messages:
                 new_messages.append(message)
         return new_messages

{leadguru_jobs-0.421.0 → leadguru_jobs-0.423.0}/lgt_jobs/lgt_common/slack_client/slack_client.py

@@ -145,24 +145,24 @@ class SlackClient:
         url = f'{self.base_url}{SlackMethods.conversations_open}?{self.__im_open_payload(user)}'
         return requests.post(url=url, cookies=self.cookies).json()
 
-    def delete_message(self, channel: str, ts: str):
-        url = f'{self.base_url}{SlackMethods.chat_delete}?{self.__delete_message_payload(channel, ts)}'
+    def delete_message(self, channel: str, id: str):
+        url = f'{self.base_url}{SlackMethods.chat_delete}?{self.__delete_message_payload(channel, id)}'
         return requests.post(url=url, cookies=self.cookies).json()
 
     def conversations_info(self, channel: str):
         url = f'{self.base_url}{SlackMethods.conversations_info}?{self.__conversation_info_payload(channel)}'
         return requests.post(url=url, cookies=self.cookies).json()
 
-    def update_message(self, channel: str, ts: str, text: str, file_ids: str):
-        url = f'{self.base_url}{SlackMethods.chat_update}?{self.__update_message_payload(channel, ts, text, file_ids)}'
+    def update_message(self, channel: str, id: str, text: str, file_ids: str):
+        url = f'{self.base_url}{SlackMethods.chat_update}?{self.__update_message_payload(channel, id, text, file_ids)}'
         return requests.post(url=url, cookies=self.cookies).json()
 
-    def conversations_history(self, channel: str, ts: str = None):
-        url = f'{self.base_url}{SlackMethods.conversations_history}?{self.__channel_payload(channel, ts)}'
+    def conversations_history(self, channel: str, id: str = None):
+        url = f'{self.base_url}{SlackMethods.conversations_history}?{self.__channel_payload(channel, id)}'
         return requests.get(url=url, cookies=self.cookies).json()
 
-    def conversations_replies(self, channel: str, ts: str):
-        url = f'{self.base_url}{SlackMethods.conversations_replies}?{self.__ts_payload(channel, ts)}'
+    def conversations_replies(self, channel: str, id: str):
+        url = f'{self.base_url}{SlackMethods.conversations_replies}?{self.__ts_payload(channel, id)}'
         return requests.get(url=url, cookies=self.cookies).json()
 
     def get_presense(self, user: str = None):
@@ -198,8 +198,8 @@ class SlackClient:
         url = f'{self.base_url}{SlackMethods.users_info}?{self.__user_info_payload(user)}'
         return requests.get(url=url, cookies=self.cookies).json()
 
-    def get_reactions(self, channel: str, ts: str):
-        url = f'{self.base_url}{SlackMethods.reactions_get}?{self.__get_reactions_payload(channel, ts)}'
+    def get_reactions(self, channel: str, id: str):
+        url = f'{self.base_url}{SlackMethods.reactions_get}?{self.__get_reactions_payload(channel, id)}'
         return requests.get(url=url, cookies=self.cookies).json()
 
     def get_attachments(self, channel: str, msg_id: str, url: str):
@@ -303,12 +303,12 @@ class SlackClient:
         }
         return parse.urlencode(payload)
 
-    def __update_message_payload(self, channel, ts, text, file_ids):
+    def __update_message_payload(self, channel, id, text, file_ids):
         payload = {
             'parse': 'none',
             'token': self.token,
             'channel': channel,
-            'ts': ts,
+            'ts': id,
             'text': text,
             'file_ids': file_ids
         }
@@ -322,11 +322,11 @@ class SlackClient:
         }
         return parse.urlencode(payload)
 
-    def __delete_message_payload(self, channel, ts):
+    def __delete_message_payload(self, channel, id):
         payload = {
             'token': self.token,
             'channel': channel,
-            'ts': ts
+            'ts': id
         }
         return parse.urlencode(payload)
 
@@ -352,14 +352,14 @@ class SlackClient:
         }
         return parse.urlencode(payload)
 
-    def __channel_payload(self, channel, ts=None):
+    def __channel_payload(self, channel, id=None):
         payload = {
             'token': self.token,
             'channel': channel
         }
 
-        if ts:
-            payload["ts"] = ts
+        if id:
+            payload["ts"] = id
             payload["limit"] = 1
             payload["inclusive"] = True
 
@@ -374,19 +374,19 @@ class SlackClient:
             payload["user"] = user
         return parse.urlencode(payload)
 
-    def __ts_payload(self, channel: str, ts: str):
+    def __ts_payload(self, channel: str, id: str):
         payload = {
             'token': self.token,
             'channel': channel,
-            'ts': ts
+            'ts': id
         }
         return parse.urlencode(payload)
 
-    def __get_reactions_payload(self, channel, ts):
+    def __get_reactions_payload(self, channel, id):
         payload = {
             'token': self.token,
             'full': True,
             'channel': channel,
-            'timestamp': ts
+            'timestamp': id
         }
         return parse.urlencode(payload)

{leadguru_jobs-0.421.0 → leadguru_jobs-0.423.0}/lgt_jobs/lgt_common/slack_client/web_client.py

@@ -28,7 +28,7 @@ class SlackMessageConvertService:
         result.bot_id = bot_id
         result.text = dic.get('text', '')
         result.user = dic.get('user', '')
-        result.ts = dic.get('ts', '')
+        result.id = dic.get('ts', '')
         result.attachments = dic.get('attachments', [])
         result.files = []
         result.user_id = to_object_id(user_id)
@@ -51,7 +51,7 @@ class SlackMessageConvertService:
                                                                       new_file.mimetype, cookies)
                 result.files.append(new_file)
 
-        js_ticks = int(result.ts.split('.')[0] + result.ts.split('.')[1][3:])
+        js_ticks = int(result.id.split('.')[0] + result.id.split('.')[1][3:])
         result.created_at = datetime.fromtimestamp(js_ticks / 1000.0)
         return result
 
@@ -88,11 +88,11 @@ class SlackWebClient:
 
         self.client = SlackClient(token, cookies)
 
-    def delete_message(self, channel: str, ts: str):
-        return self.client.delete_message(channel, ts)
+    def delete_message(self, channel: str, id: str):
+        return self.client.delete_message(channel, id)
 
-    def update_message(self, channel: str, ts: str, text: str, file_ids=''):
-        return self.client.update_message(channel, ts, text, file_ids)
+    def update_message(self, channel: str, id: str, text: str, file_ids=''):
+        return self.client.update_message(channel, id, text, file_ids)
 
     def get_profile(self, user_id):
         return self.client.user_info(user_id)
@@ -124,8 +124,8 @@ class SlackWebClient:
     def channel_leave(self, channels):
         return self.client.leave_channels(channels)
 
-    def get_reactions(self, channel, ts):
-        return self.client.get_reactions(channel, ts)
+    def get_reactions(self, channel, id):
+        return self.client.get_reactions(channel, id)
 
     def upload_file(self, file, file_name):
         return self.client.upload_file(file, file_name)
@@ -151,8 +151,8 @@ class SlackWebClient:
     def find_workspaces(self, user_agent: str, ) -> requests.Response:
         return self.client.find_workspaces(user_agent)
 
-    def conversation_replies(self, channel: str, ts: str) -> dict:
-        return self.client.conversations_replies(channel, ts)
+    def conversation_replies(self, channel: str, id: str) -> dict:
+        return self.client.conversations_replies(channel, id)
 
     def create_shared_invite(self):
         return self.client.create_shared_invite()

{leadguru_jobs-0.421.0 → leadguru_jobs-0.423.0}/lgt_jobs/lgt_data/model.py

@@ -576,7 +576,7 @@ class ChatMessage:
     sender_id: str
     text: str
     user: str
-    ts: str
+    id: str
     viewed: bool
     files: list
     attachments: list[dict] | None
@@ -601,7 +601,7 @@ class ChatMessage:
         self.text: str = ''
         self.created_at: datetime
         self.user = ''
-        self.ts = ''
+        self.id = ''
         self.files = []
         self.attachments = []
 

{leadguru_jobs-0.421.0 → leadguru_jobs-0.423.0}/lgt_jobs/lgt_data/mongo_repository.py

@@ -1077,8 +1077,11 @@ class ChatRepository(BaseMongoRepository):
             pipeline['sender_id'] = sender_id
 
         return [ChatMessage.from_dic(msg)
-                for msg in self.collection().find(pipeline).sort("ts", pymongo.ASCENDING)]
+                for msg in self.collection().find(pipeline).sort("id", pymongo.ASCENDING)]
 
     def upsert_messages(self, messages: list[dict]):
-        operations = [UpdateOne({"ts": msg['ts']}, {'$set': msg}, upsert=True) for msg in messages]
+        operations = [UpdateOne({"id": msg['id']}, {'$set': msg}, upsert=True) for msg in messages]
         self.collection().bulk_write(operations)
+
+    def delete_message(self, user_id: str, _id: str):
+        self.collection().delete_one({"id": _id, 'user_id': to_object_id(user_id)})