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

Merge pull request #1387 from yashsriv/extend/fuzzy

Browse source 
Extend fuzzy search in autocomplete to all strategies
This commit is contained in:
Pavel Djundik 2017-08-24 12:01:34 +03:00 committed by GitHub
parent 06741a1e1c 0e332ec19d
commit 60e69a83fc
1 changed files with 61 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

100
client/js/lounge.js
View file

@ -51,17 +51,10 @@ $(function() {
id: "emoji", id: "emoji",
match: /\B:([-+\w:?]{2,}):?$/, match: /\B:([-+\w:?]{2,}):?$/,
search(term, callback) { search(term, callback) {
const results = fuzzy.filter( // Trim colon from the matched term,
// Trim colon from the matched term, // as we are unable to get a clean string from match regex
// as we are unable to get a clean string from match regex term = term.replace(/:$/, ""),
term.replace(/:$/, ""), callback(fuzzyGrep(term, emojiSearchTerms));
emojiSearchTerms,
{
pre: "<b>",
post: "</b>"
}
);
callback(results.map((el) => [el.string, el.original]));
}, },
template([string, original]) { template([string, original]) {
return `<span class="emoji">${emojiMap[original]}</span> ${string}`; return `<span class="emoji">${emojiMap[original]}</span> ${string}`;
@ -78,16 +71,17 @@ $(function() {
search(term, callback) { search(term, callback) {
term = term.slice(1); term = term.slice(1);
if (term[0] === "@") { if (term[0] === "@") {
callback(completeNicks(term.slice(1)).map((val) => "@" + val)); callback(completeNicks(term.slice(1), true)
.map((val) => ["@" + val[0], "@" + val[1]]));
} else { } else {
callback(completeNicks(term)); callback(completeNicks(term, true));
} }
}, },
template(value) { template([string, ]) {
return value; return string;
}, },
replace(value) { replace([, original]) {
return value; return original;
}, },
index: 1 index: 1
}; };
@ -98,11 +92,11 @@ $(function() {
search(term, callback, match) { search(term, callback, match) {
callback(completeChans(match[0])); callback(completeChans(match[0]));
}, },
template(value) { template([string,]) {
return value; return string;
}, },
replace(value) { replace([, original]) {
return value; return original;
}, },
index: 1 index: 1
}; };
@ -113,11 +107,11 @@ $(function() {
search(term, callback) { search(term, callback) {
callback(completeCommands("/" + term)); callback(completeCommands("/" + term));
}, },
template(value) { template([string, ]) {
return value; return string;
}, },
replace(value) { replace([, original]) {
return value; return original;
}, },
index: 1 index: 1
}; };
@ -127,8 +121,18 @@ $(function() {
match: /\x03(\d{0,2}|[A-Za-z ]{0,10})$/, match: /\x03(\d{0,2}|[A-Za-z ]{0,10})$/,
search(term, callback) { search(term, callback) {
term = term.toLowerCase(); term = term.toLowerCase();
const matchingColorCodes = constants.colorCodeMap const matchingColorCodes = constants.colorCodeMap
.filter((i) => i[0].startsWith(term) || i[1].toLowerCase().startsWith(term)); .filter((i) => fuzzy.test(term, i[0]) || fuzzy.test(term, i[1]))
.map((i) => {
if (fuzzy.test(term, i[1])) {
return [i[0], fuzzy.match(term, i[1], {
pre: "<b>",
post: "</b>"
}).rendered];
}
return i;
});
callback(matchingColorCodes); callback(matchingColorCodes);
}, },
@ -147,7 +151,16 @@ $(function() {
search(term, callback, match) { search(term, callback, match) {
term = term.toLowerCase(); term = term.toLowerCase();
const matchingColorCodes = constants.colorCodeMap const matchingColorCodes = constants.colorCodeMap
.filter((i) => i[0].startsWith(term) || i[1].toLowerCase().startsWith(term)) .filter((i) => fuzzy.test(term, i[0]) || fuzzy.test(term, i[1]))
.map((pair) => {
if (fuzzy.test(term, pair[1])) {
return [pair[0], fuzzy.match(term, pair[1], {
pre: "<b>",
post: "</b>"
}).rendered];
}
return pair;
})
.map((pair) => pair.concat(match[1])); // Needed to pass fg color to `template`... .map((pair) => pair.concat(match[1])); // Needed to pass fg color to `template`...
callback(matchingColorCodes); callback(matchingColorCodes);
@ -278,7 +291,7 @@ $(function() {
chat.find(".chan.active .chat").trigger("msg.sticky"); // fix growing chat.find(".chan.active .chat").trigger("msg.sticky"); // fix growing
}) })
.tab(completeNicks, {hint: false}) .tab((word) => completeNicks(word, false), {hint: false})
.on("autocomplete:on", function() { .on("autocomplete:on", function() {
enableAutocomplete(); enableAutocomplete();
}); });
@ -919,8 +932,21 @@ $(function() {
} }
}()); }());
function completeNicks(word) { function fuzzyGrep(term, array) {
const results = fuzzy.filter(
term,
array,
{
pre: "<b>",
post: "</b>"
}
);
return results.map((el) => [el.string, el.original]);
}
function completeNicks(word, isFuzzy) {
const users = chat.find(".active .users"); const users = chat.find(".active .users");
word = word.toLowerCase();
// Lobbies and private chats do not have an user list // Lobbies and private chats do not have an user list
if (!users.length) { if (!users.length) {
@ -928,20 +954,19 @@ $(function() {
} }
const words = users.data("nicks"); const words = users.data("nicks");
if (isFuzzy) {
return fuzzyGrep(word, words);
}
return $.grep( return $.grep(
words, words,
(w) => !w.toLowerCase().indexOf(word.toLowerCase()) (w) => !w.toLowerCase().indexOf(word)
); );
} }
function completeCommands(word) { function completeCommands(word) {
const words = constants.commands.slice(); const words = constants.commands.slice();
return $.grep( return fuzzyGrep(word, words);
words,
(w) => !w.toLowerCase().indexOf(word.toLowerCase())
);
} }
function completeChans(word) { function completeChans(word) {
@ -955,10 +980,7 @@ $(function() {
} }
}); });
return $.grep( return fuzzyGrep(word, words);
words,
(w) => !w.toLowerCase().indexOf(word.toLowerCase())
);
} }
$(document).on("visibilitychange focus click", () => { $(document).on("visibilitychange focus click", () => {