Don't send IMDN for outgoing messages

blink/chatwindow.py

@@ -2426,7 +2426,7 @@ class ChatWindow(base_class, ui_class, ColorHelperMixin):
         else:
             self.render_after_load.append(ChatMessage(content, sender, direction, id=message.id))
 
-        if message.disposition is not None and 'display' in message.disposition and not encrypted:
+        if direction != 'outgoing' and message.disposition is not None and 'display' in message.disposition and not encrypted:
             if self.selected_session.blink_session is blink_session and not self.isMinimized() and self.isActiveWindow():
                 MessageManager().send_imdn_message(blink_session, message.id, message.timestamp, 'displayed', account)
             else:
@@ -2496,7 +2496,7 @@ class ChatWindow(base_class, ui_class, ColorHelperMixin):
 
             account_manager = AccountManager()
             account = account_manager.get_account(message.account_id) if account_manager.has_account(message.account_id) else None
-            if message.state != 'displayed' and 'display' in message.disposition:
+            if message.direction != 'outgoing' and message.state != 'displayed' and 'display' in message.disposition:
                 if message.state != 'delivered' and 'positive-delivery' in message.disposition:
                     MessageManager().send_imdn_message(blink_session, message.message_id, message.timestamp, 'delivered', account)
 

blink/history.py

@@ -434,8 +434,12 @@ class MessageHistory(object, metaclass=Singleton):
         except IndexError:
             pass
         else:
-            # print(f'-- Updating {id} {message.state} -> {state}')
-            message.state = state
+            if message.direction == 'outgoing' and state == 'received':
+                return
+
+            if message.state != 'displayed' and message.state != state:
+                # print(f'-- Updating {message.direction} {id} {message.state} -> {state}')
+                message.state = state
 
     @run_in_thread('db')
     def update_encryption(self, notification):

blink/messages.py

@@ -333,7 +333,7 @@ class OutgoingMessage(object):
 
     @property
     def message(self):
-        return BlinkMessage(self.content, self.content_type, self.account, timestamp=self.timestamp, id=self.id, is_secure=self.is_secure)
+        return BlinkMessage(self.content, self.content_type, self.account, timestamp=self.timestamp, id=self.id, is_secure=self.is_secure, direction='outgoing')
 
     def _lookup(self):
         settings = SIPSimpleSettings()
@@ -581,7 +581,7 @@ class MessageManager(object, metaclass=Singleton):
         if account is session.account:
             notification_center.post_notification('BlinkMessageIsParsed', sender=session, data=message)
 
-        if message is not None and 'positive-delivery' in message.disposition:
+        if message is not None and message.direction != 'outgoing' and 'positive-delivery' in message.disposition:
             print("-- Should send delivered imdn")
             self.send_imdn_message(session, message.id, message.timestamp, 'delivered')
 
@@ -902,9 +902,17 @@ class MessageManager(object, metaclass=Singleton):
 
     def _NH_PGPMessageDidNotDecrypt(self, notification):
         session = notification.sender
-        data = notification.data.message
+        message = notification.data.message
 
-        self.send_imdn_message(session, data.message_id, data.timestamp, 'error')
+        if message.direction == 'outgoing':
+            return
+
+        try:
+            msg_id = message.message_id
+        except AttributeError:
+            msg_id = message.id
+
+        self.send_imdn_message(session, msg_id, message.timestamp, 'error')
 
     def export_private_key(self, account):
         if account is None: