diff options
| -rw-r--r-- | libdino/src/service/content_item_store.vala | 5 | ||||
| -rw-r--r-- | main/src/ui/util/helper.vala | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/libdino/src/service/content_item_store.vala b/libdino/src/service/content_item_store.vala index b3e32cf4..c3d9d006 100644 --- a/libdino/src/service/content_item_store.vala +++ b/libdino/src/service/content_item_store.vala @@ -121,6 +121,8 @@ public class ContentItemStore : StreamInteractionModule, Object { Message? message = get_message_for_content_item(conversation, content_item); if (message == null) return null; + if (message.edit_to != null) return message.edit_to; + if (conversation.type_ == Conversation.Type.CHAT) { return message.stanza_id; } else { @@ -131,6 +133,9 @@ public class ContentItemStore : StreamInteractionModule, Object { public Jid? get_message_sender_for_content_item(Conversation conversation, ContentItem content_item) { Message? message = get_message_for_content_item(conversation, content_item); if (message == null) return null; + + // No need to look at edit_to, because it's the same sender JID. + return message.from; } diff --git a/main/src/ui/util/helper.vala b/main/src/ui/util/helper.vala index 58614bb8..ecf0ab25 100644 --- a/main/src/ui/util/helper.vala +++ b/main/src/ui/util/helper.vala @@ -419,7 +419,8 @@ public string summarize_whitespaces_to_space(string s) { try { return (/\s+/).replace_literal(s, -1, 0, " "); } catch (RegexError e) { - assert_not_reached(); + critical("RegexError when summarizing whitespaces in '%s': %s", s, e.message); + return s; } } |