djsundog/brutaldon
1
0
Fork 0
mirror of http://git.carcosa.net/jmcbray/brutaldon.git synced 2024-11-23 15:23:52 -05:00
Code Issues Projects Releases Wiki Activity

Simplify filter matching.

Browse Source 
Concatenate filter phrases and do the re.search only once.
This commit is contained in:
Jason McBrayer 2019-02-15 11:28:07 -05:00
parent dfccfab05b
commit bdc9524532
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
brutaldon/views.py
View File

@ -164,16 +164,14 @@ def get_filters(mastodon, context=None):
return []
def toot_matches_filters(toot, filters=[]):
for filter in filters:
def maybe_rewrite_filter(filter):
if filter.whole_word:
filter = f"\b{filter}\b"
try:
if re.search(filter.phrase, toot.spoiler_text, re.I) or re.search(filter.phrase, toot.content, re.I):
return True
except AttributeError: # probably a reblog or favorite
continue
return False
return f"\\b{filter.phrase}\\b"
else:
return filter.phrase
phrases = [maybe_rewrite_filter(x) for x in filters]
pattern = "|".join(phrases)
return re.search(pattern, toot.spoiler_text + toot.content, re.I)
###
### View functions