Avoid duplication

merge-requests/30/head
Bob Mottram 2020-10-25 12:22:09 +00:00
parent fce789c2e9
commit e5c436fa3f
1 changed files with 2 additions and 4 deletions

View File

@ -104,14 +104,12 @@ def hashtagRuleResolve(tree: [], hashtags: [], moderated: bool,
return matchStrLower in contentWithoutTags return matchStrLower in contentWithoutTags
elif tree[0] == 'from': elif tree[0] == 'from':
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]
return matchStr.lower() in url
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]