anotherim/anotherim-desktop
2
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix typing notifications in groupchats

Browse source
This commit is contained in:
Marvin W 2023-03-01 19:50:29 +01:00
parent fb799e3ba8
commit 76e1410c2a
No known key found for this signature in database
GPG key ID: 072E9235DB996F2A
2 changed files with 7 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libdino/src/service/message_processor.vala
View file

@ -451,6 +451,10 @@ public class MessageProcessor : StreamInteractionModule, Object {
} }
} }
if (conversation.get_send_typing_setting(stream_interactor) == Conversation.Setting.ON) {
ChatStateNotifications.add_state_to_message(new_message, ChatStateNotifications.STATE_ACTIVE);
}
stream.get_module(MessageModule.IDENTITY).send_message.begin(stream, new_message, (_, res) => { stream.get_module(MessageModule.IDENTITY).send_message.begin(stream, new_message, (_, res) => {
try { try {
stream.get_module(MessageModule.IDENTITY).send_message.end(res); stream.get_module(MessageModule.IDENTITY).send_message.end(res);

21
xmpp-vala/src/module/xep/0085_chat_state_notifications.vala
View file

@ -16,14 +16,12 @@ public class Module : XmppStreamModule {
public signal void chat_state_received(XmppStream stream, Jid jid, string state, MessageStanza stanza); public signal void chat_state_received(XmppStream stream, Jid jid, string state, MessageStanza stanza);
private SendPipelineListener send_pipeline_listener = new SendPipelineListener();
/** /**
* "A message stanza that does not contain standard messaging content [...] SHOULD be a state other than <active/>" (0085, 5.6) * "A message stanza that does not contain standard messaging content [...] SHOULD be a state other than <active/>" (0085, 5.6)
*/ */
public void send_state(XmppStream stream, Jid jid, string message_type, string state) { public void send_state(XmppStream stream, Jid jid, string message_type, string state) {
MessageStanza message = new MessageStanza() { to=jid, type_=message_type }; MessageStanza message = new MessageStanza() { to=jid, type_=message_type };
message.stanza.put_node(new StanzaNode.build(state, NS_URI).add_self_xmlns()); add_state_to_message(message, state);
MessageProcessingHints.set_message_hint(message, MessageProcessingHints.HINT_NO_STORE); MessageProcessingHints.set_message_hint(message, MessageProcessingHints.HINT_NO_STORE);
@ -32,14 +30,12 @@ public class Module : XmppStreamModule {
public override void attach(XmppStream stream) { public override void attach(XmppStream stream) {
stream.get_module(ServiceDiscovery.Module.IDENTITY).add_feature(stream, NS_URI); stream.get_module(ServiceDiscovery.Module.IDENTITY).add_feature(stream, NS_URI);
stream.get_module(MessageModule.IDENTITY).send_pipeline.connect(send_pipeline_listener);
stream.get_module(MessageModule.IDENTITY).received_message.connect(on_received_message); stream.get_module(MessageModule.IDENTITY).received_message.connect(on_received_message);
} }
public override void detach(XmppStream stream) { public override void detach(XmppStream stream) {
stream.get_module(ServiceDiscovery.Module.IDENTITY).remove_feature(stream, NS_URI); stream.get_module(ServiceDiscovery.Module.IDENTITY).remove_feature(stream, NS_URI);
stream.get_module(MessageModule.IDENTITY).received_message.disconnect(on_received_message); stream.get_module(MessageModule.IDENTITY).received_message.disconnect(on_received_message);
stream.get_module(MessageModule.IDENTITY).send_pipeline.disconnect(send_pipeline_listener);
} }
public override string get_ns() { return NS_URI; } public override string get_ns() { return NS_URI; }
@ -57,19 +53,8 @@ public class Module : XmppStreamModule {
} }
} }
public class SendPipelineListener : StanzaListener<MessageStanza> { public static void add_state_to_message(MessageStanza message, string state) {
message.stanza.put_node(new StanzaNode.build(state, NS_URI).add_self_xmlns());
private 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 bool run(XmppStream stream, MessageStanza message) {
if (message.body == null) return false;
if (message.type_ != MessageStanza.TYPE_CHAT) return false;
message.stanza.put_node(new StanzaNode.build(STATE_ACTIVE, NS_URI).add_self_xmlns());
return false;
}
} }
} }