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

Only do quotes substitution with html

merge-requests/8/head
Bob Mottram 2020-08-02 18:27:56 +01:00
parent 5efc685220
commit 1ba6861e88
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
content.py
View File

@ -639,7 +639,7 @@ def addHtmlTags(baseDir: str, httpPrefix: str,
if longWordsList: if longWordsList:
content = removeLongWords(content, maxWordLength, longWordsList) content = removeLongWords(content, maxWordLength, longWordsList)
content = content.replace(' --linebreak-- ', '</p><p>') content = content.replace(' --linebreak-- ', '</p><p>')
return '<p>' + htmlReplaceQuoteMarks(content) + '</p>' return '<p>' + content + '</p>'
def getMentionsFromHtml(htmlText: str, def getMentionsFromHtml(htmlText: str,

5
webinterface.py
View File

@ -57,6 +57,7 @@ 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 blocking import isBlockedHashtag
from content import htmlReplaceQuoteMarks
from content import removeTextFormatting from content import removeTextFormatting
from content import switchWords from content import switchWords
from content import getMentionsFromHtml from content import getMentionsFromHtml
@ -4260,8 +4261,10 @@ def individualPostAsHtml(recentPostsCache: {}, maxRecentPosts: int,
objectContent = removeTextFormatting(objectContent) objectContent = removeTextFormatting(objectContent)
objectContent = \ objectContent = \
switchWords(baseDir, nickname, domain, objectContent) switchWords(baseDir, nickname, domain, objectContent)
objectContent = htmlReplaceQuoteMarks(objectContent)
else: else:
objectContent = postJsonObject['object']['content'] objectContent = \
htmlReplaceQuoteMarks(postJsonObject['object']['content'])
if not postIsSensitive: if not postIsSensitive:
contentStr = objectContent + attachmentStr contentStr = objectContent + attachmentStr