deblan-mirror/thelounge
deblan-mirror/thelounge
1
0
Fork 0
mirror of https://github.com/thelounge/thelounge.git synced 2024-06-20 14:35:10 +02:00
Code Issues Projects Releases Wiki Activity

add autocompleted names to private chats

Browse source 
Fix #1459

https://github.com/thelounge/lounge/issues/1459

Add rawNicks() to more easily get the list of nicks for the current
channel or chat without overly complicating its caller.
This commit is contained in:
Ed Brannin 2017-10-28 23:03:27 -04:00 committed by Pavel Djundik
parent 14ef881d17
commit 4e67e55a7d
1 changed files with 23 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
client/js/autocompletion.js
View file

@ -261,23 +261,37 @@ function fuzzyGrep(term, array) {
return results.map((el) => [el.string, el.original]); return results.map((el) => [el.string, el.original]);
} }
function completeNicks(word, isFuzzy) { function rawNicks() {
const users = chat.find(".active .users"); const chan = chat.find(".active");
word = word.toLowerCase(); const users = chan.find(".users");
// Lobbies and private chats do not have an user list // If this channel has a list of nicks, just return it
if (!users.length) { if (users.length > 0) {
return []; return users.data("nicks");
} }
const words = users.data("nicks"); const me = $("#nick-value").text();
const otherUser = chan.attr("aria-label");
// If this is a query, add their name to autocomplete
if (me !== otherUser && chan.data("type") === "query") {
return [otherUser, me];
}
// Return our own name by default for anything that isn't a channel or query
return [me];
}
function completeNicks(word, isFuzzy) {
const users = rawNicks();
word = word.toLowerCase();
if (isFuzzy) { if (isFuzzy) {
return fuzzyGrep(word, words); return fuzzyGrep(word, users);
} }
return $.grep( return $.grep(
words, users,
(w) => !w.toLowerCase().indexOf(word) (w) => !w.toLowerCase().indexOf(word)
); );
} }