1 files changed, 15 insertions, 8 deletions
diff --git a/xmpp-vala/src/module/xep/0085_chat_state_notifications.vala b/xmpp-vala/src/module/xep/0085_chat_state_notifications.vala
index 5de504a2..3ca97282 100644
--- a/xmpp-vala/src/module/xep/0085_chat_state_notifications.vala
+++ b/xmpp-vala/src/module/xep/0085_chat_state_notifications.vala
@@ -31,24 +31,17 @@ public class Module : XmppStreamModule {
 
     public override void attach(XmppStream stream) {
         stream.get_module(ServiceDiscovery.Module.IDENTITY).add_feature(stream, NS_URI);
-        stream.get_module(Message.Module.IDENTITY).pre_send_message.connect(on_pre_send_message);
+        stream.get_module(Message.Module.IDENTITY).send_pipeline.connect(new SendPipelineListener());
         stream.get_module(Message.Module.IDENTITY).received_message.connect(on_received_message);
     }
 
     public override void detach(XmppStream stream) {
-        stream.get_module(Message.Module.IDENTITY).pre_send_message.disconnect(on_pre_send_message);
         stream.get_module(Message.Module.IDENTITY).received_message.disconnect(on_received_message);
     }
 
     public override string get_ns() { return NS_URI; }
     public override string get_id() { return IDENTITY.id; }
 
-    private void on_pre_send_message(XmppStream stream, Message.Stanza message) {
-        if (message.body == null) return;
-        if (message.type_ != Message.Stanza.TYPE_CHAT) return;
-        message.stanza.put_node(new StanzaNode.build(STATE_ACTIVE, NS_URI).add_self_xmlns());
-    }
-
     private void on_received_message(XmppStream stream, Message.Stanza message) {
         if (!message.is_error()) {
             Gee.List<StanzaNode> nodes = message.stanza.get_all_subnodes();
@@ -62,4 +55,18 @@ public class Module : XmppStreamModule {
     }
 }
 
+public class SendPipelineListener : StanzaListener<Message.Stanza> {
+
+    private const string[] after_actions_const = {"MODIFY_BODY"};
+
+    public override string action_group { get { return "ADD_NODES"; } }
+    public override string[] after_actions { get { return after_actions_const; } }
+
+    public override async void run(Core.XmppStream stream, Message.Stanza message) {
+        if (message.body == null) return;
+        if (message.type_ != Message.Stanza.TYPE_CHAT) return;
+        message.stanza.put_node(new StanzaNode.build(STATE_ACTIVE, NS_URI).add_self_xmlns());
+    }
+}
+
 }