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

Avoid content processing if this is a patch

merge-requests/30/head
Bob Mottram 2020-05-02 20:02:51 +00:00
parent 05b8da4c0e
commit 7dd72896a0
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
webinterface.py
View File

@ -69,7 +69,6 @@ from happening import thisWeeksEventsCheck
from happening import getCalendarEvents from happening import getCalendarEvents
from happening import getTodaysEvents from happening import getTodaysEvents
from git import isGitPatch from git import isGitPatch
from git import gitFormatContent
def updateAvatarImageCache(session, baseDir: str, httpPrefix: str, def updateAvatarImageCache(session, baseDir: str, httpPrefix: str,
@ -3935,10 +3934,15 @@ def individualPostAsHtml(recentPostsCache: {}, maxRecentPosts: int,
if not postJsonObject['object'].get('content'): if not postJsonObject['object'].get('content'):
return '' return ''
objectContent = \ isPatch = isGitPatch(baseDir, nickname, domain,
removeLongWords(postJsonObject['object']['content'], 40, []) postJsonObject['object']['summary'],
objectContent = \ postJsonObject['object']['content'])
switchWords(baseDir, nickname, domain, objectContent)
if not isPatch:
objectContent = \
removeLongWords(postJsonObject['object']['content'], 40, [])
objectContent = \
switchWords(baseDir, nickname, domain, objectContent)
if not postIsSensitive: if not postIsSensitive:
contentStr = objectContent + attachmentStr contentStr = objectContent + attachmentStr
contentStr = addEmbeddedElements(translate, contentStr) contentStr = addEmbeddedElements(translate, contentStr)
@ -3959,12 +3963,14 @@ def individualPostAsHtml(recentPostsCache: {}, maxRecentPosts: int,
"'" + postID + "'" + ')">' + translate['SHOW MORE'] + '</button>' "'" + postID + "'" + ')">' + translate['SHOW MORE'] + '</button>'
contentStr += '<div class="cwText" id="' + postID + '">' contentStr += '<div class="cwText" id="' + postID + '">'
contentStr += objectContent + attachmentStr contentStr += objectContent + attachmentStr
contentStr = addEmbeddedElements(translate, contentStr) if not isPatch:
contentStr = insertQuestion(baseDir, translate, nickname, domain, port, contentStr = addEmbeddedElements(translate, contentStr)
contentStr, postJsonObject, pageNumber) contentStr = \
insertQuestion(baseDir, translate, nickname, domain, port,
contentStr, postJsonObject, pageNumber)
contentStr += '</div>' contentStr += '</div>'
if postJsonObject['object'].get('tag'): if postJsonObject['object'].get('tag') and not isPatch:
contentStr = \ contentStr = \
replaceEmojiFromTags(contentStr, replaceEmojiFromTags(contentStr,
postJsonObject['object']['tag'], postJsonObject['object']['tag'],
@ -3973,9 +3979,7 @@ def individualPostAsHtml(recentPostsCache: {}, maxRecentPosts: int,
if isMuted: if isMuted:
contentStr = '' contentStr = ''
else: else:
if not isGitPatch(baseDir, nickname, domain, if not isPatch:
postJsonObject['object']['summary'],
postJsonObject['object']['content']):
contentStr = '<div class="message">' + contentStr + '</div>' contentStr = '<div class="message">' + contentStr + '</div>'
else: else:
contentStr = \ contentStr = \