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

Generate html for announce first

merge-requests/30/head
Bob Mottram 2021-09-04 17:11:48 +01:00
parent c5d89455fb
commit 4a7c6c6976
1 changed files with 34 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
inbox.py
View File

@ -1529,6 +1529,40 @@ def _receiveAnnounce(recentPostsCache: {},
print('DEBUG: Downloading announce post ' + messageJson['actor'] + print('DEBUG: Downloading announce post ' + messageJson['actor'] +
' -> ' + messageJson['object']) ' -> ' + messageJson['object'])
domainFull = getFullDomain(domain, port) domainFull = getFullDomain(domain, port)
# generate html
pageNumber = 1
showPublishedDateOnly = False
showIndividualPostIcons = True
manuallyApproveFollowers = \
followerApprovalActive(baseDir, nickname, domain)
notDM = True
# if debug:
print('Generating html for announce ' + messageJson['id'])
announceHtml = \
individualPostAsHtml(signingPrivateKeyPem, True,
recentPostsCache, maxRecentPosts,
translate, pageNumber, baseDir,
session, cachedWebfingers, personCache,
nickname, domain, port, messageJson,
None, True, allowDeletion,
httpPrefix, __version__,
'inbox', YTReplacementDomain,
showPublishedDateOnly,
peertubeInstances,
allowLocalNetworkAccess,
themeName, systemLanguage,
maxLikeCount, notDM,
showIndividualPostIcons,
manuallyApproveFollowers,
False, True, False)
if not announceHtml:
print('WARN: Unable to generate html for announce ' +
str(messageJson))
else:
# if debug:
print('Generated announce html ' + announceHtml.replace('\n', ''))
postJsonObject = downloadAnnounce(session, baseDir, postJsonObject = downloadAnnounce(session, baseDir,
httpPrefix, httpPrefix,
nickname, domain, nickname, domain,
@ -1605,35 +1639,6 @@ def _receiveAnnounce(recentPostsCache: {},
time.sleep(5) time.sleep(5)
if debug: if debug:
print('DEBUG: announced/repeated post arrived in inbox') print('DEBUG: announced/repeated post arrived in inbox')
pageNumber = 1
showPublishedDateOnly = False
showIndividualPostIcons = True
manuallyApproveFollowers = \
followerApprovalActive(baseDir, nickname, domain)
notDM = True
#if debug:
print('Generating html for announce ' + postJsonObject['id'])
announceHtml = \
individualPostAsHtml(signingPrivateKeyPem, True,
recentPostsCache, maxRecentPosts,
translate, pageNumber, baseDir,
session, cachedWebfingers, personCache,
nickname, domain, port, postJsonObject,
None, True, allowDeletion,
httpPrefix, __version__,
'inbox', YTReplacementDomain,
showPublishedDateOnly,
peertubeInstances,
allowLocalNetworkAccess,
themeName, systemLanguage,
maxLikeCount, notDM,
showIndividualPostIcons,
manuallyApproveFollowers,
False, True, False)
if not announceHtml:
print('WARN: Unable to generate html for announce ' +
postJsonObject['id'])
return True return True