diff options
| -rw-r--r-- | src/chat_control.py | 5 | ||||
| -rw-r--r-- | src/common/events.py | 5 | ||||
| -rw-r--r-- | src/session.py | 3 |
3 files changed, 8 insertions, 5 deletions
diff --git a/src/chat_control.py b/src/chat_control.py index 370c4f3f1..ac7e3e448 100644 --- a/src/chat_control.py +++ b/src/chat_control.py @@ -939,7 +939,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): if not count_as_new: return - if kind in ('incoming', 'outgoing'): + if kind in ('incoming', 'incoming_queue', 'outgoing'): self.last_received_txt[name] = text if correct_id: self.last_received_id[name] = correct_id[0] @@ -3076,7 +3076,8 @@ class ChatControl(ChatControlBase): kind = 'out' self.print_conversation(event.message, kind, tim=event.time, encrypted=event.encrypted, subject=event.subject, - xhtml=event.xhtml, displaymarking=event.displaymarking) + xhtml=event.xhtml, displaymarking=event.displaymarking, + correct_id=event.correct_id) if isinstance(event.msg_log_id, int): message_ids.append(event.msg_log_id) diff --git a/src/common/events.py b/src/common/events.py index b83a4d0a7..e24ed4644 100644 --- a/src/common/events.py +++ b/src/common/events.py @@ -65,8 +65,8 @@ class Event: class ChatEvent(Event): type_ = 'chat' def __init__ (self, message, subject, kind, time, encrypted, resource, - msg_log_id=None, xhtml=None, session=None, form_node=None, displaymarking=None, - sent_forwarded=False, time_=None, show_in_roster=False, + msg_log_id, correct_id=None, xhtml=None, session=None, form_node=None, + displaymarking=None, sent_forwarded=False, time_=None, show_in_roster=False, show_in_systray=True): Event.__init__(self, time_, show_in_roster=show_in_roster, show_in_systray=show_in_systray) @@ -77,6 +77,7 @@ class ChatEvent(Event): self.encrypted = encrypted self.resource = resource self.msg_log_id = msg_log_id + self.correct_id = correct_id self.xhtml = xhtml self.session = session self.form_node = form_node diff --git a/src/session.py b/src/session.py index afa5f6428..7c27b009c 100644 --- a/src/session.py +++ b/src/session.py @@ -255,7 +255,8 @@ class ChatControlSession(stanza_session.EncryptedStanzaSession): if (not self.control and obj.mtype != 'normal') or \ (obj.mtype == 'normal' and not obj.popup): event = event_t(obj.msgtxt, obj.subject, obj.mtype, obj.timestamp, - obj.encrypted, obj.resource, obj.msg_log_id, xhtml=obj.xhtml, + obj.encrypted, obj.resource, obj.msg_log_id, + correct_id=(obj.id_, obj.correct_id), xhtml=obj.xhtml, session=self, form_node=obj.form_node, displaymarking=obj.displaymarking, sent_forwarded=obj.forwarded and obj.sent, |