1 files changed, 24 insertions, 0 deletions
diff --git a/libdino/src/service/message_processor.vala b/libdino/src/service/message_processor.vala
index 676daa72..7201085e 100644
--- a/libdino/src/service/message_processor.vala
+++ b/libdino/src/service/message_processor.vala
@@ -39,6 +39,7 @@ public class MessageProcessor : StreamInteractionModule, Object {
         received_pipeline.connect(new StoreMessageListener(this, stream_interactor));
         received_pipeline.connect(new StoreContentItemListener(stream_interactor));
         received_pipeline.connect(new MarkupListener(stream_interactor));
+        received_pipeline.connect(new PreDisplayedHandler(stream_interactor));
 
         stream_interactor.account_added.connect(on_account_added);
 
@@ -379,6 +380,29 @@ public class MessageProcessor : StreamInteractionModule, Object {
         }
     }
 
+    private class PreDisplayedHandler : MessageListener {
+        public string[] after_actions_const = new string[]{ "STORE_CONTENT_ITEM" };
+        public override string action_group { get { return "DISPLAYED_HANDLING"; } }
+        public override string[] after_actions { get { return after_actions_const; } }
+
+        private StreamInteractor stream_interactor;
+
+        public PreDisplayedHandler(StreamInteractor stream_interactor) {
+            this.stream_interactor = stream_interactor;
+        }
+
+        public override async bool run(Entities.Message message, Xmpp.MessageStanza stanza, Conversation conversation) {
+            var flag = stream_interactor.get_stream(conversation.account).get_flag(MessageDisplayedSynchronization.Flag.IDENTITY);
+            if (flag != null && message.server_id != null) {
+                Jid stanza_id_by = message.type_ == Message.Type.GROUPCHAT ? conversation.counterpart.bare_jid : conversation.account.bare_jid;
+                if (flag.is_displayed(conversation.counterpart, stanza_id_by, message.server_id)) {
+                    stream_interactor.get_module(CounterpartInteractionManager.IDENTITY).mark_displayed_up_to_message(conversation, message);
+                }
+            }
+            return false;
+        }
+    }
+
     public Entities.Message create_out_message(string? text, Conversation conversation) {
         Entities.Message message = new Entities.Message(text);
         message.type_ = Util.get_message_type_for_conversation(conversation);