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

Don't create a second message object for each typing notification

Browse source
This commit is contained in:
fiaxh 2020-07-06 19:32:16 +02:00
parent c887240fdc
commit b104be4842
3 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
libdino/src/service/conversation_manager.vala
View file

@ -84,6 +84,17 @@ public class ConversationManager : StreamInteractionModule, Object {
return null; return null;
} }
public Conversation? approx_conversation_for_stanza(Jid jid, Account account, string msg_ty) {
if (msg_ty == Xmpp.MessageStanza.TYPE_GROUPCHAT) {
return get_conversation(jid.bare_jid, account, Conversation.Type.GROUPCHAT);
} else if (msg_ty == Xmpp.MessageStanza.TYPE_CHAT && jid.is_full() &&
get_conversation(jid.bare_jid, account, Conversation.Type.GROUPCHAT) != null) {
var pm = get_conversation(jid, account, Conversation.Type.GROUPCHAT_PM);
if (pm != null) return pm;
}
return get_conversation(jid.bare_jid, account, Conversation.Type.CHAT);
}
public Conversation? get_conversation_by_id(int id) { public Conversation? get_conversation_by_id(int id) {
foreach (HashMap<Jid, Gee.List<Conversation>> hm in conversations.values) { foreach (HashMap<Jid, Gee.List<Conversation>> hm in conversations.values) {
foreach (Gee.List<Conversation> hm2 in hm.values) { foreach (Gee.List<Conversation> hm2 in hm.values) {

6
libdino/src/service/counterpart_interaction_manager.vala
View file

@ -95,8 +95,7 @@ public class CounterpartInteractionManager : StreamInteractionModule, Object {
// Don't show our own (other devices) typing notification // Don't show our own (other devices) typing notification
if (jid.equals_bare(account.bare_jid)) return; if (jid.equals_bare(account.bare_jid)) return;
Message message = yield stream_interactor.get_module(MessageProcessor.IDENTITY).parse_message_stanza(account, stanza); Conversation? conversation = stream_interactor.get_module(ConversationManager.IDENTITY).approx_conversation_for_stanza(jid, account, stanza.type_);
Conversation? conversation = stream_interactor.get_module(ConversationManager.IDENTITY).get_conversation_for_message(message);
if (conversation == null) return; if (conversation == null) return;
// Don't show our own typing notification in MUCs // Don't show our own typing notification in MUCs
@ -119,8 +118,7 @@ public class CounterpartInteractionManager : StreamInteractionModule, Object {
} }
private async void on_chat_marker_received(Account account, Jid jid, string marker, string stanza_id, MessageStanza message_stanza) { private async void on_chat_marker_received(Account account, Jid jid, string marker, string stanza_id, MessageStanza message_stanza) {
Message message = yield stream_interactor.get_module(MessageProcessor.IDENTITY).parse_message_stanza(account, message_stanza); Conversation? conversation = stream_interactor.get_module(ConversationManager.IDENTITY).approx_conversation_for_stanza(jid, account, message_stanza.type_);
Conversation? conversation = stream_interactor.get_module(ConversationManager.IDENTITY).get_conversation_for_message(message);
if (conversation == null) return; if (conversation == null) return;
handle_chat_marker(conversation, jid, marker, stanza_id); handle_chat_marker(conversation, jid, marker, stanza_id);
} }

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

@ -341,7 +341,7 @@ public class MessageProcessor : StreamInteractionModule, Object {
message_sent_or_received(message, conversation); message_sent_or_received(message, conversation);
} }
public async Entities.Message parse_message_stanza(Account account, Xmpp.MessageStanza message) { private async Entities.Message parse_message_stanza(Account account, Xmpp.MessageStanza message) {
string? body = message.body; string? body = message.body;
if (body != null) body = body.strip(); if (body != null) body = body.strip();
Entities.Message new_message = new Entities.Message(body); Entities.Message new_message = new Entities.Message(body);