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

Show post being replied to on new post screen

merge-requests/30/head
Bob Mottram 2021-11-12 19:12:53 +00:00
parent 5f8911d77a
commit d87cb69fd0
2 changed files with 108 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
daemon.py
View File

@ -2550,7 +2550,26 @@ class PubServer(BaseHTTPRequestHandler):
self.server.themeName, self.server.themeName,
True, accessKeys, True, accessKeys,
customSubmitText, customSubmitText,
conversationId).encode('utf-8') conversationId,
self.server.recentPostsCache,
self.server.maxRecentPosts,
self.server.session,
self.server.cachedWebfingers,
self.server.personCache,
self.server.port,
None,
self.server.projectVersion,
self.server.YTReplacementDomain,
self.server.twitterReplacementDomain,
self.server.showPublishedDateOnly,
self.server.peertubeInstances,
self.server.allowLocalNetworkAccess,
self.server.systemLanguage,
self.server.maxLikeCount,
self.server.signingPrivateKeyPem,
self.server.CWlists,
self.server.listsEnabled,
self.server.defaultTimeline).encode('utf-8')
msglen = len(msg) msglen = len(msg)
self._set_headers('text/html', msglen, self._set_headers('text/html', msglen,
cookie, callingDomain, False) cookie, callingDomain, False)
@ -2665,7 +2684,26 @@ class PubServer(BaseHTTPRequestHandler):
self.server.themeName, self.server.themeName,
True, accessKeys, True, accessKeys,
customSubmitText, customSubmitText,
conversationId).encode('utf-8') conversationId,
self.server.recentPostsCache,
self.server.maxRecentPosts,
self.server.session,
self.server.cachedWebfingers,
self.server.personCache,
self.server.port,
None,
self.server.projectVersion,
self.server.YTReplacementDomain,
self.server.twitterReplacementDomain,
self.server.showPublishedDateOnly,
self.server.peertubeInstances,
self.server.allowLocalNetworkAccess,
self.server.systemLanguage,
self.server.maxLikeCount,
self.server.signingPrivateKeyPem,
self.server.CWlists,
self.server.listsEnabled,
self.server.defaultTimeline).encode('utf-8')
msglen = len(msg) msglen = len(msg)
self._set_headers('text/html', msglen, self._set_headers('text/html', msglen,
cookie, callingDomain, False) cookie, callingDomain, False)
@ -12519,6 +12557,13 @@ class PubServer(BaseHTTPRequestHandler):
customSubmitText = getConfigParam(baseDir, 'customSubmitText') customSubmitText = getConfigParam(baseDir, 'customSubmitText')
postJsonObject = None
if inReplyToUrl:
replyPostFilename = \
locatePost(baseDir, nickname, domain, inReplyToUrl)
if replyPostFilename:
postJsonObject = loadJson(replyPostFilename)
msg = htmlNewPost(self.server.cssCache, msg = htmlNewPost(self.server.cssCache,
mediaInstance, mediaInstance,
translate, translate,
@ -12536,7 +12581,26 @@ class PubServer(BaseHTTPRequestHandler):
self.server.themeName, self.server.themeName,
noDropDown, accessKeys, noDropDown, accessKeys,
customSubmitText, customSubmitText,
conversationId).encode('utf-8') conversationId,
self.server.recentPostsCache,
self.server.maxRecentPosts,
self.server.session,
self.server.cachedWebfingers,
self.server.personCache,
self.server.port,
postJsonObject,
self.server.projectVersion,
self.server.YTReplacementDomain,
self.server.twitterReplacementDomain,
self.server.showPublishedDateOnly,
self.server.peertubeInstances,
self.server.allowLocalNetworkAccess,
self.server.systemLanguage,
self.server.maxLikeCount,
self.server.signingPrivateKeyPem,
self.server.CWlists,
self.server.listsEnabled,
self.server.defaultTimeline).encode('utf-8')
if not msg: if not msg:
print('Error replying to ' + inReplyToUrl) print('Error replying to ' + inReplyToUrl)
self._404() self._404()

42
webapp_create_post.py
View File

@ -23,6 +23,7 @@ from webapp_utils import htmlFooter
from webapp_utils import editTextField from webapp_utils import editTextField
from webapp_utils import editNumberField from webapp_utils import editNumberField
from webapp_utils import editCurrencyField from webapp_utils import editCurrencyField
from webapp_post import individualPostAsHtml
def _htmlFollowingDataList(baseDir: str, nickname: str, def _htmlFollowingDataList(baseDir: str, nickname: str,
@ -195,7 +196,21 @@ def htmlNewPost(cssCache: {}, mediaInstance: bool, translate: {},
defaultTimeline: str, newswire: {}, defaultTimeline: str, newswire: {},
theme: str, noDropDown: bool, theme: str, noDropDown: bool,
accessKeys: {}, customSubmitText: str, accessKeys: {}, customSubmitText: str,
conversationId: str) -> str: conversationId: str,
recentPostsCache: {}, maxRecentPosts: int,
session, cachedWebfingers: {},
personCache: {}, port: int,
postJsonObject: {},
projectVersion: str,
YTReplacementDomain: str,
twitterReplacementDomain: str,
showPublishedDateOnly: bool,
peertubeInstances: [],
allowLocalNetworkAccess: bool,
systemLanguage: str,
maxLikeCount: int, signingPrivateKeyPem: str,
CWlists: {}, listsEnabled: str,
boxName: str) -> str:
"""New post screen """New post screen
""" """
replyStr = '' replyStr = ''
@ -242,6 +257,31 @@ def htmlNewPost(cssCache: {}, mediaInstance: bool, translate: {},
'" rel="nofollow noopener noreferrer" ' + \ '" rel="nofollow noopener noreferrer" ' + \
'target="_blank">' + \ 'target="_blank">' + \
translate['this post'] + '</a></p>\n' translate['this post'] + '</a></p>\n'
if postJsonObject:
newPostText += \
individualPostAsHtml(signingPrivateKeyPem,
True, recentPostsCache,
maxRecentPosts,
translate, None,
baseDir, session,
cachedWebfingers,
personCache,
nickname, domain, port,
postJsonObject,
None, True, False,
httpPrefix, projectVersion,
boxName,
YTReplacementDomain,
twitterReplacementDomain,
showPublishedDateOnly,
peertubeInstances,
allowLocalNetworkAccess,
theme, systemLanguage,
maxLikeCount,
False, False, False,
False, False, False,
CWlists, listsEnabled)
replyStr = '<input type="hidden" ' + \ replyStr = '<input type="hidden" ' + \
'name="replyTo" value="' + inReplyTo + '">\n' 'name="replyTo" value="' + inReplyTo + '">\n'