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

Order MUC occupants tab completion by most recent message sent

Browse source 
fixes #401
This commit is contained in:
fiaxh 2019-04-16 11:44:14 +02:00
parent ca9b00d5e8
commit b0dde02bc9
1 changed files with 22 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
main/src/ui/chat_input/occupants_tab_completer.vala
View file

@ -101,15 +101,34 @@ class OccupantsTabCompletor {
private Gee.List<string> generate_completions_from_occupants(string prefix) { private Gee.List<string> generate_completions_from_occupants(string prefix) {
Gee.List<string> ret = new ArrayList<string>(); Gee.List<string> ret = new ArrayList<string>();
// First suggest nicks that have recently writen something
Gee.List<Message> messages = stream_interactor.get_module(MessageStorage.IDENTITY).get_messages(conversation, 50);
for (int i = messages.size - 1; i > 0; i--) {
string resourcepart = messages[i].from.resourcepart;
Jid? own_nick = stream_interactor.get_module(MucManager.IDENTITY).get_own_jid(conversation.counterpart, conversation.account);
if (resourcepart != null && resourcepart != "" &&
resourcepart.to_string().down().has_prefix(prefix.down()) &&
(own_nick == null || resourcepart != own_nick.resourcepart) &&
!ret.contains(resourcepart)) {
ret.add(resourcepart.to_string());
}
}
// Then, suggest other nicks in alphabetical order
Gee.List<Jid>? occupants = stream_interactor.get_module(MucManager.IDENTITY).get_other_occupants(conversation.counterpart, conversation.account); Gee.List<Jid>? occupants = stream_interactor.get_module(MucManager.IDENTITY).get_other_occupants(conversation.counterpart, conversation.account);
Gee.List<string> filtered_occupants = new ArrayList<string>();
if (occupants != null) { if (occupants != null) {
foreach (Jid jid in occupants) { foreach (Jid jid in occupants) {
if (jid.resourcepart.to_string().down().has_prefix(prefix.down())) { string resourcepart = jid.resourcepart.to_string();
ret.add(jid.resourcepart.to_string()); if (resourcepart.down().has_prefix(prefix.down()) && !ret.contains(resourcepart)) {
filtered_occupants.add(resourcepart);
} }
} }
} }
ret.sort(); filtered_occupants.sort();
ret.add_all(filtered_occupants);
return ret; return ret;
} }
} }