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

Validation of categories

merge-requests/30/head
Bob Mottram 2021-02-09 22:42:29 +00:00
parent 2e6fe854f8
commit 0826326653
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
content.py
View File

@ -389,8 +389,6 @@ def validHashTag(hashtag: str) -> bool:
'ŴŵÝýŸÿŶŷŹźŽžŻż') 'ŴŵÝýŸÿŶŷŹźŽžŻż')
if set(hashtag).issubset(validChars): if set(hashtag).issubset(validChars):
return True return True
if '#' in hashtag or '"' in hashtag or '&' in hashtag:
return False
if isValidLanguage(hashtag): if isValidLanguage(hashtag):
return True return True
return False return False

8
webapp_hashtagswarm.py
View File

@ -203,8 +203,12 @@ def htmlHashTagSwarm(baseDir: str, actor: str, translate: {}) -> str:
categoryStr = \ categoryStr = \
getHashtagCategory(baseDir, hashTagName) getHashtagCategory(baseDir, hashTagName)
if len(categoryStr) < maxTagLength: if len(categoryStr) < maxTagLength:
if categoryStr not in categorySwarm: if '#' not in categoryStr and \
categorySwarm.append(categoryStr) '&' not in categoryStr and \
'"' not in categoryStr and \
"'" not in categoryStr:
if categoryStr not in categorySwarm:
categorySwarm.append(categoryStr)
break break
break break