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

Comment

main
Bob Mottram 2019-11-25 10:29:09 +00:00
parent c6d008b28a
commit a5651335f6
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
webinterface.py
View File

@ -1756,7 +1756,8 @@ def followerApprovalActive(baseDir: str,nickname: str,domain: str) -> bool:
return manuallyApprovesFollowers return manuallyApprovesFollowers
def insertQuestion(translate: {}, \ def insertQuestion(translate: {}, \
nickname: str,content: str, \ nickname: str,domain: str,port: int, \
content: str, \
postJsonObject: {},pageNumber: int) -> str: postJsonObject: {},pageNumber: int) -> str:
""" Inserts question selection into a post """ Inserts question selection into a post
""" """
@ -1886,6 +1887,8 @@ def saveIndividualPostAsHtmlToCache(baseDir: str,nickname: str,domain: str, \
return False return False
def preparePostFromHtmlCache(postHtml: str,boxName: str,pageNumber: int) -> str: def preparePostFromHtmlCache(postHtml: str,boxName: str,pageNumber: int) -> str:
"""Sets the page number on a cached html post
"""
# if on the bookmarks timeline then remain there # if on the bookmarks timeline then remain there
if boxName=='tlbookmarks': if boxName=='tlbookmarks':
postHtml=postHtml.replace('?tl=inbox','?tl=tlbookmarks') postHtml=postHtml.replace('?tl=inbox','?tl=tlbookmarks')
@ -2328,7 +2331,8 @@ def individualPostAsHtml(recentPostsCache: {},maxRecentPosts: int, \
if not postJsonObject['object']['sensitive']: if not postJsonObject['object']['sensitive']:
contentStr=objectContent+attachmentStr contentStr=objectContent+attachmentStr
contentStr=addEmbeddedElements(translate,contentStr) contentStr=addEmbeddedElements(translate,contentStr)
contentStr=insertQuestion(translate,nickname,contentStr,postJsonObject,pageNumber) contentStr=insertQuestion(translate,nickname,domain,port, \
contentStr,postJsonObject,pageNumber)
else: else:
postID='post'+str(createPassword(8)) postID='post'+str(createPassword(8))
contentStr='' contentStr=''
@ -2340,7 +2344,8 @@ def individualPostAsHtml(recentPostsCache: {},maxRecentPosts: int, \
contentStr+='<div class="cwText" id="'+postID+'">' contentStr+='<div class="cwText" id="'+postID+'">'
contentStr+=objectContent+attachmentStr contentStr+=objectContent+attachmentStr
contentStr=addEmbeddedElements(translate,contentStr) contentStr=addEmbeddedElements(translate,contentStr)
contentStr=insertQuestion(translate,nickname,contentStr,postJsonObject,pageNumber) contentStr=insertQuestion(translate,nickname,domain,port, \
contentStr,postJsonObject,pageNumber)
contentStr+='</div>' contentStr+='</div>'
if postJsonObject['object'].get('tag'): if postJsonObject['object'].get('tag'):