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

Don't replace emoji within json content

main2
Bob Mottram 2019-10-29 13:04:38 +00:00
parent ded29f2527
commit 14d7e2e2b2
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
content.py
View File

@ -254,7 +254,7 @@ def removeLongWords(content: str,maxWordLength: int,longWordsList: []) -> str:
def addHtmlTags(baseDir: str,httpPrefix: str, \ def addHtmlTags(baseDir: str,httpPrefix: str, \
nickname: str,domain: str,content: str, \ nickname: str,domain: str,content: str, \
recipients: [],hashtags: {}) -> str: recipients: [],hashtags: {},isJsonContent=False) -> str:
""" Replaces plaintext mentions such as @nick@domain into html """ Replaces plaintext mentions such as @nick@domain into html
by matching against known following accounts by matching against known following accounts
""" """
@ -340,9 +340,10 @@ def addHtmlTags(baseDir: str,httpPrefix: str, \
content=content.replace(wordStr,replaceStr) content=content.replace(wordStr,replaceStr)
for wordStr,replaceStr in replaceHashTags.items(): for wordStr,replaceStr in replaceHashTags.items():
content=content.replace(wordStr,replaceStr) content=content.replace(wordStr,replaceStr)
for wordStr,replaceStr in replaceEmoji.items(): if not isJsonContent:
content=content.replace(wordStr,replaceStr) for wordStr,replaceStr in replaceEmoji.items():
content=content.replace(wordStr,replaceStr)
content=addWebLinks(content) content=addWebLinks(content)
if longWordsList: if longWordsList:
content=removeLongWords(content,maxWordLength,longWordsList) content=removeLongWords(content,maxWordLength,longWordsList)

2
posts.py
View File

@ -483,7 +483,7 @@ def createPostBase(baseDir: str,nickname: str, domain: str, port: int, \
addHtmlTags(baseDir,httpPrefix, \ addHtmlTags(baseDir,httpPrefix, \
nickname,domain,content, \ nickname,domain,content, \
mentionedRecipients, \ mentionedRecipients, \
hashtagsDict) hashtagsDict,True)
statusNumber,published = getStatusNumber() statusNumber,published = getStatusNumber()
postTo='https://www.w3.org/ns/activitystreams#Public' postTo='https://www.w3.org/ns/activitystreams#Public'

4
tests.py
View File

@ -1559,13 +1559,15 @@ def testAddEmoji():
contentModified= \ contentModified= \
addHtmlTags(baseDir,httpPrefix, \ addHtmlTags(baseDir,httpPrefix, \
nickname,domain,content, \ nickname,domain,content, \
recipients,hashtags) recipients,hashtags,True)
assert ':lemon:' in contentModified
tags=[] tags=[]
for tagName,tag in hashtags.items(): for tagName,tag in hashtags.items():
tags.append(tag) tags.append(tag)
content=contentModified content=contentModified
contentModified=replaceEmojiFromTags(content,tags,'content') contentModified=replaceEmojiFromTags(content,tags,'content')
assert 'img src' in contentModified assert 'img src' in contentModified
assert ':lemon:' not in contentModified
os.chdir(baseDirOriginal) os.chdir(baseDirOriginal)
shutil.rmtree(baseDirOriginal+'/.tests') shutil.rmtree(baseDirOriginal+'/.tests')