indymedia
/
epicyon
mirror of https://gitlab.com/bashrc2/epicyon
7
4
Fork 1
Code Issues 14 Releases Wiki Activity

Case insensitive matching for hashtag rules

merge-requests/30/head
Bob Mottram 2020-10-17 20:04:39 +01:00
parent da9810e186
commit 9cb5df52d5
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
newsdaemon.py
View File

@ -99,13 +99,13 @@ def hashtagRuleResolve(tree: [], hashtags: [], moderated: bool,
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]
return matchStr in content return matchStr.lower() in content
elif isinstance(tree[1], list): elif isinstance(tree[1], list):
matchStr = tree[1][0] matchStr = tree[1][0]
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]
return matchStr in content return matchStr.lower() in content
elif tree[0] == 'and': elif tree[0] == 'and':
if len(tree) == 3: if len(tree) == 3:
@ -234,6 +234,7 @@ def newswireHashtagProcessing(session, baseDir: str, postJsonObject: {},
content += postJsonObject['object']['content'] content += postJsonObject['object']['content']
if postJsonObject['object'].get('summary'): if postJsonObject['object'].get('summary'):
content += ' ' + postJsonObject['object']['summary'] content += ' ' + postJsonObject['object']['summary']
content = content.lower()
# actionOccurred = False # actionOccurred = False
operators = ('not', 'and', 'or', 'contains') operators = ('not', 'and', 'or', 'contains')