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

Don't show blocked hashtags

main
Bob Mottram 2019-12-13 09:46:46 +00:00
parent c3b98a0497
commit 08b98516f9
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
webinterface.py
View File

@ -48,6 +48,7 @@ from like import noOfLikes
from bookmarks import bookmarkedByPerson from bookmarks import bookmarkedByPerson
from announce import announcedByPerson from announce import announcedByPerson
from blocking import isBlocked from blocking import isBlocked
from blocking import isBlockedHashtag
from content import getMentionsFromHtml from content import getMentionsFromHtml
from content import addHtmlTags from content import addHtmlTags
from content import replaceEmojiFromTags from content import replaceEmojiFromTags
@ -3757,6 +3758,9 @@ def htmlHashTagCloud(baseDir: str,path: str) -> str:
tagsFilename=os.path.join(baseDir+'/tags',f) tagsFilename=os.path.join(baseDir+'/tags',f)
if not os.path.isfile(tagsFilename): if not os.path.isfile(tagsFilename):
continue continue
hashTagName=f.split('.')[0]
if isBlockedHashtag(baseDir,hashTagName):
continue
if daysSinceEpochStr not in open(tagsFilename).read(): if daysSinceEpochStr not in open(tagsFilename).read():
continue continue
with open(tagsFilename, 'r') as tagsFile: with open(tagsFilename, 'r') as tagsFile:
@ -3771,7 +3775,7 @@ def htmlHashTagCloud(baseDir: str,path: str) -> str:
if postDaysSinceEpoch<daysSinceEpoch: if postDaysSinceEpoch<daysSinceEpoch:
break break
if postDaysSinceEpoch==daysSinceEpoch: if postDaysSinceEpoch==daysSinceEpoch:
tagCloud.append(f.split('.')[0]) tagCloud.append(hashTagName)
break break
if not tagCloud: if not tagCloud:
return '' return ''