mj-saunders
/
epicyon
forked from indymedia/epicyon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Avoid duplication

main
Bob Mottram 2020-10-25 12:17:59 +00:00
parent 8aecc5827b
commit fce789c2e9
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
newsdaemon.py
View File

@ -90,16 +90,12 @@ def hashtagRuleResolve(tree: [], hashtags: [], moderated: bool,
content, url) content, url)
elif tree[0] == 'contains': elif tree[0] == 'contains':
if len(tree) == 2: if len(tree) == 2:
matchStr = None
if isinstance(tree[1], str): if isinstance(tree[1], str):
matchStr = tree[1] matchStr = tree[1]
if matchStr.startswith('"') and matchStr.endswith('"'):
matchStr = matchStr[1:]
matchStr = matchStr[:len(matchStr) - 1]
matchStrLower = matchStr.lower()
contentWithoutTags = content.replace('#' + matchStrLower, '')
return matchStrLower in contentWithoutTags
elif isinstance(tree[1], list): elif isinstance(tree[1], list):
matchStr = tree[1][0] matchStr = tree[1][0]
if matchStr:
if matchStr.startswith('"') and matchStr.endswith('"'): if matchStr.startswith('"') and matchStr.endswith('"'):
matchStr = matchStr[1:] matchStr = matchStr[1:]
matchStr = matchStr[:len(matchStr) - 1] matchStr = matchStr[:len(matchStr) - 1]