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

Handle unknown own MUC jid better

Browse source
This commit is contained in:
fiaxh 2020-04-14 16:28:36 +02:00
parent fbd70ceaac
commit 13d3d2aca6
2 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -68,17 +68,22 @@ public class MessageCorrection : StreamInteractionModule, MessageListener {
public bool is_own_correction_allowed(Conversation conversation, Message message) { public bool is_own_correction_allowed(Conversation conversation, Message message) {
string stanza_id = message.edit_to ?? message.stanza_id; string stanza_id = message.edit_to ?? message.stanza_id;
Jid own_jid = conversation.account.full_jid; Jid? own_jid = null;
if (conversation.type_ == Conversation.Type.GROUPCHAT) { if (conversation.type_ == Conversation.Type.CHAT) {
own_jid = conversation.account.full_jid;
} else if (conversation.type_ == Conversation.Type.GROUPCHAT) {
own_jid = stream_interactor.get_module(MucManager.IDENTITY).get_own_jid(conversation.counterpart, conversation.account); own_jid = stream_interactor.get_module(MucManager.IDENTITY).get_own_jid(conversation.counterpart, conversation.account);
} }
if (own_jid == null) return false;
return last_messages.has_key(conversation) && return last_messages.has_key(conversation) &&
last_messages[conversation].has_key(own_jid) && last_messages[conversation].has_key(own_jid) &&
last_messages[conversation][own_jid].stanza_id == stanza_id; last_messages[conversation][own_jid].stanza_id == stanza_id;
} }
private void check_add_correction_node(Entities.Message message, Xmpp.MessageStanza message_stanza, Conversation conversation) { private void check_add_correction_node(Entities.Message message, Xmpp.MessageStanza message_stanza, Conversation conversation) {
if (message.stanza_id in outstanding_correction_nodes) { if (outstanding_correction_nodes.has_key(message.stanza_id)) {
LastMessageCorrection.set_replace_id(message_stanza, outstanding_correction_nodes[message.stanza_id]); LastMessageCorrection.set_replace_id(message_stanza, outstanding_correction_nodes[message.stanza_id]);
outstanding_correction_nodes.unset(message.stanza_id); outstanding_correction_nodes.unset(message.stanza_id);
} else { } else {

15
libdino/src/service/notification_events.vala
View file

@ -48,6 +48,9 @@ public class NotificationEvents : StreamInteractionModule, Object {
private bool should_notify(ContentItem content_item, Conversation conversation) { private bool should_notify(ContentItem content_item, Conversation conversation) {
Conversation.NotifySetting notify = conversation.get_notification_setting(stream_interactor); Conversation.NotifySetting notify = conversation.get_notification_setting(stream_interactor);
if (notify == Conversation.NotifySetting.OFF) return false;
switch (content_item.type_) { switch (content_item.type_) {
case MessageItem.TYPE: case MessageItem.TYPE:
Message message = (content_item as MessageItem).message; Message message = (content_item as MessageItem).message;
@ -60,13 +63,13 @@ public class NotificationEvents : StreamInteractionModule, Object {
if (file_transfer.direction == FileTransfer.DIRECTION_SENT) return false; if (file_transfer.direction == FileTransfer.DIRECTION_SENT) return false;
break; break;
} }
if (notify == Conversation.NotifySetting.OFF) return false;
Jid? nick = stream_interactor.get_module(MucManager.IDENTITY).get_own_jid(conversation.counterpart, conversation.account); if (content_item.type_ == MessageItem.TYPE && notify == Conversation.NotifySetting.HIGHLIGHT) {
if (content_item.type_ == MessageItem.TYPE) { Jid? nick = stream_interactor.get_module(MucManager.IDENTITY).get_own_jid(conversation.counterpart, conversation.account);
if (nick == null) return false;
Entities.Message message = (content_item as MessageItem).message; Entities.Message message = (content_item as MessageItem).message;
if (notify == Conversation.NotifySetting.HIGHLIGHT && nick != null) { return Regex.match_simple("\\b" + Regex.escape_string(nick.resourcepart) + "\\b", message.body, RegexCompileFlags.CASELESS);
return Regex.match_simple("\\b" + Regex.escape_string(nick.resourcepart) + "\\b", message.body, RegexCompileFlags.CASELESS);
}
} }
return true; return true;
} }