about summary refs log tree commit diff
path: root/app/javascript/mastodon/selectors
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2018-07-06 02:15:44 +0200
committerGitHub <noreply@github.com>2018-07-06 02:15:44 +0200
commit404c7702ec2a6576ef3b54f6a800624adfda9d53 (patch)
tree80c543822195128f73b7f4f234dc7624cf136cea /app/javascript/mastodon/selectors
parent17b928502a968d8051fd3dc31be046aba96fde6f (diff)
In keyword filter, account for reblogs, HTML and whole-words (#7960)
* In keyword filter, account for reblogs, HTML and whole-words

* Match whole words in JS filter, too

* Fix typo
Diffstat (limited to 'app/javascript/mastodon/selectors')
-rw-r--r--app/javascript/mastodon/selectors/index.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/mastodon/selectors/index.js b/app/javascript/mastodon/selectors/index.js
index 56eca1f02..ba9777eba 100644
--- a/app/javascript/mastodon/selectors/index.js
+++ b/app/javascript/mastodon/selectors/index.js
@@ -43,7 +43,7 @@ const regexFromFilters = filters => {
     return null;
   }
 
-  return new RegExp(filters.map(filter => escapeRegExp(filter.get('phrase'))).join('|'), 'i');
+  return new RegExp(filters.map(filter => escapeRegExp(filter.get('phrase'))).map(expr => `\\b${expr}\\b`).join('|'), 'i');
 };
 
 export const makeGetStatus = () => {