From 3fc9bdab053e23ab8e97afadfee0a05afad8d890 Mon Sep 17 00:00:00 2001 From: Marvin W Date: Thu, 9 Jan 2020 14:28:08 +0100 Subject: Correctly display names in groupchat pms Also show "Me" when no local alias is set instead of JID --- libdino/src/entity/message.vala | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'libdino/src/entity/message.vala') diff --git a/libdino/src/entity/message.vala b/libdino/src/entity/message.vala index d5697c72..e87d0e3a 100644 --- a/libdino/src/entity/message.vala +++ b/libdino/src/entity/message.vala @@ -22,7 +22,11 @@ public class Message : Object { CHAT, GROUPCHAT, GROUPCHAT_PM, - UNKNOWN + UNKNOWN; + + public bool is_muc_semantic() { + return this == GROUPCHAT || this == GROUPCHAT_PM; + } } public int id { get; set; default = -1; } @@ -74,7 +78,7 @@ public class Message : Object { if (counterpart_resource != null) counterpart = counterpart.with_resource(counterpart_resource); string our_resource = row[db.message.our_resource]; - if (type_ == Type.GROUPCHAT && our_resource != null) { + if (type_.is_muc_semantic() && our_resource != null) { ourpart = counterpart.with_resource(our_resource); } else if (our_resource != null) { ourpart = account.bare_jid.with_resource(our_resource); -- cgit v1.2.3-54-g00ecf