Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Make whole-word filter regex consistent between Ruby and JS (#7987)

Browse source
This commit is contained in:
Eugen Rochko 2018-07-10 03:01:50 +02:00 • committed by GitHub
parent 1ca4e51eb3
commit 20fefdb714
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

13
app/javascript/mastodon/selectors/index.js
View file

@ -47,7 +47,18 @@ export const regexFromFilters = filters => {
return new RegExp(filters.map(filter => {
let expr = escapeRegExp(filter.get('phrase'));
return filter.get('whole_word') ? `\\b${expr}\\b` : expr;
if (filter.get('whole_word')) {
if (/^[\w]/.test(expr)) {
expr = `\\b${expr}`;
}
if (/[\w]$/.test(expr)) {
expr = `${expr}\\b`;
}
}
return expr;
}).join('|'), 'i');
};