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

Check for blocked hashtag with hash prefix

main
Bob Mottram 2020-12-03 19:51:47 +00:00
parent c0eedb0716
commit 60abb1a0a6
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
blocking.py
View File

@ -131,6 +131,8 @@ def isBlockedHashtag(baseDir: str, hashtag: str) -> bool:
globalBlockingFilename = baseDir + '/accounts/blocking.txt' globalBlockingFilename = baseDir + '/accounts/blocking.txt'
if os.path.isfile(globalBlockingFilename): if os.path.isfile(globalBlockingFilename):
hashtag = hashtag.strip('\n').strip('\r') hashtag = hashtag.strip('\n').strip('\r')
if not hashtag.startswith('#'):
hashtag = '#' + hashtag
if hashtag + '\n' in open(globalBlockingFilename).read(): if hashtag + '\n' in open(globalBlockingFilename).read():
return True return True
return False return False

2
newswire.py
View File

@ -123,7 +123,7 @@ def addNewswireDictEntry(baseDir: str, domain: str,
# check that no tags are blocked # check that no tags are blocked
for tag in postTags: for tag in postTags:
if isBlockedHashtag(baseDir, tag.replace('#', '')): if isBlockedHashtag(baseDir, tag):
return return
newswire[dateStr] = [ newswire[dateStr] = [