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

Private MUCs w/o name: Display localparts instead of barejids if name is not known

Browse source
This commit is contained in:
fiaxh 2018-12-28 13:35:52 +01:00
parent d8e0ab406c
commit 1014b696f2
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
main/src/ui/util/helper.vala
View file

@ -58,7 +58,7 @@ public static string get_conversation_display_name(StreamInteractor stream_inter
return get_display_name(stream_interactor, conversation.counterpart, conversation.account); return get_display_name(stream_interactor, conversation.counterpart, conversation.account);
} }
public static string get_display_name(StreamInteractor stream_interactor, Jid jid, Account account) { public static string get_display_name(StreamInteractor stream_interactor, Jid jid, Account account, bool fallback_to_localpart = false) {
if (stream_interactor.get_module(MucManager.IDENTITY).is_groupchat(jid, account)) { if (stream_interactor.get_module(MucManager.IDENTITY).is_groupchat(jid, account)) {
MucManager muc_manager = stream_interactor.get_module(MucManager.IDENTITY); MucManager muc_manager = stream_interactor.get_module(MucManager.IDENTITY);
string room_name = muc_manager.get_room_name(account, jid); string room_name = muc_manager.get_room_name(account, jid);
@ -74,7 +74,7 @@ public static string get_display_name(StreamInteractor stream_interactor, Jid ji
if (builder.len != 0) { if (builder.len != 0) {
builder.append(", "); builder.append(", ");
} }
builder.append(get_display_name(stream_interactor, occupant, account).split(" ")[0]); builder.append(get_display_name(stream_interactor, occupant, account, true).split(" ")[0]);
} }
return builder.str; return builder.str;
} }
@ -94,7 +94,7 @@ public static string get_display_name(StreamInteractor stream_interactor, Jid ji
if (roster_item != null && roster_item.name != null && roster_item.name != "") { if (roster_item != null && roster_item.name != null && roster_item.name != "") {
return roster_item.name; return roster_item.name;
} }
return jid.bare_jid.to_string(); return fallback_to_localpart ? jid.localpart : jid.bare_jid.to_string();
} }
} }