paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-03 05:23:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

recent_topics: Use js string search method for filtering topics.

Browse Source 
This removes the confusing regex code and now we match letter
sequence in the stream and topic instead of matching complete words.
This commit is contained in:
Aman Agrawal
2020-06-29 14:45:48 +05:30
committed by Tim Abbott
parent d2a6d0dfda
commit b2ce1b1b6f
2 changed files with 34 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
static/js/recent_topics.js
View File

@@ -222,16 +222,14 @@ exports.topic_in_search_results = function (keyword, stream, topic) {
// Escape speacial characters from input.
// https://stackoverflow.com/questions/3446170/escape-string-for-use-in-javascript-regex
keyword = keyword.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
// split the search text around whitespace(s).
// eg: "Denamark recent" -> ["Denamrk", "recent"]
const search_keywords = $.trim(keyword).split(/\s+/);
// turn the search keywords into word boundary groups
// eg: ["Denamrk", "recent"] -> "^(?=.*(?:^|\s)Denmark(?:^|\s))(?=.*(?:^|\s)Recent).*$"
// https://stackoverflow.com/questions/10590098/javascript-regexp-word-boundaries-unicode-characters
const val = '^(?=.*(?:^|\\s)' + search_keywords.join('(?:^|\\s))(?=.*(?:^|\\s)') + ').*$';
const reg = RegExp(val, 'i'); // i for ignorecase
const text = (stream + " " + topic).replace(/\s+/g, ' ');
return reg.test(text);
const text = (stream + ' ' + topic).toLowerCase().replace(/\s+/g, ' ');
const search_words = keyword.toLowerCase().replace(/\s+/g, ' ').split(' ');
return search_words.every(word => {
if (text.search(word) !== -1) {
return true;
}
return false;
});
};
function filters_should_hide_topic(topic_data) {