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

Use nickname

main
Bob Mottram 2021-09-03 16:49:00 +01:00
parent a54527e00b
commit fd3a06956d
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
daemon.py
View File

@ -7738,13 +7738,13 @@ class PubServer(BaseHTTPRequestHandler):
httpPrefix, muteUrl, httpPrefix, muteUrl,
self.server.recentPostsCache, debug) self.server.recentPostsCache, debug)
muteFilename = \ muteFilename = \
locatePost(baseDir, self.postToNickname, domain, muteUrl) locatePost(baseDir, nickname, domain, muteUrl)
if muteFilename: if muteFilename:
print('Regenerating html post for changed mute status') print('Regenerating html post for changed mute status')
mutePostJson = loadJson(muteFilename, 0, 1) mutePostJson = loadJson(muteFilename, 0, 1)
if mutePostJson: if mutePostJson:
cachedPostFilename = \ cachedPostFilename = \
getCachedPostFilename(baseDir, self.postToNickname, getCachedPostFilename(baseDir, nickname,
domain, mutePostJson) domain, mutePostJson)
print('Muted post json: ' + str(mutePostJson)) print('Muted post json: ' + str(mutePostJson))
print('Muted post nickname: ' + print('Muted post nickname: ' +
@ -7753,7 +7753,7 @@ class PubServer(BaseHTTPRequestHandler):
showIndividualPostIcons = True showIndividualPostIcons = True
manuallyApproveFollowers = \ manuallyApproveFollowers = \
followerApprovalActive(baseDir, followerApprovalActive(baseDir,
self.postToNickname, domain) nickname, domain)
individualPostAsHtml(self.server.signingPrivateKeyPem, False, individualPostAsHtml(self.server.signingPrivateKeyPem, False,
self.server.recentPostsCache, self.server.recentPostsCache,
self.server.maxRecentPosts, self.server.maxRecentPosts,
@ -7762,7 +7762,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.session, self.server.session,
self.server.cachedWebfingers, self.server.cachedWebfingers,
self.server.personCache, self.server.personCache,
self.postToNickname, domain, nickname, domain,
self.server.port, mutePostJson, self.server.port, mutePostJson,
None, True, None, True,
self.server.allowDeletion, self.server.allowDeletion,
@ -7836,13 +7836,13 @@ class PubServer(BaseHTTPRequestHandler):
httpPrefix, muteUrl, httpPrefix, muteUrl,
self.server.recentPostsCache, debug) self.server.recentPostsCache, debug)
muteFilename = \ muteFilename = \
locatePost(baseDir, self.postToNickname, domain, muteUrl) locatePost(baseDir, nickname, domain, muteUrl)
if muteFilename: if muteFilename:
print('Regenerating html post for changed unmute status') print('Regenerating html post for changed unmute status')
mutePostJson = loadJson(muteFilename, 0, 1) mutePostJson = loadJson(muteFilename, 0, 1)
if mutePostJson: if mutePostJson:
cachedPostFilename = \ cachedPostFilename = \
getCachedPostFilename(baseDir, self.postToNickname, getCachedPostFilename(baseDir, nickname,
domain, mutePostJson) domain, mutePostJson)
print('Unmuted post json: ' + str(mutePostJson)) print('Unmuted post json: ' + str(mutePostJson))
print('Unmuted post nickname: ' + print('Unmuted post nickname: ' +
@ -7851,7 +7851,7 @@ class PubServer(BaseHTTPRequestHandler):
showIndividualPostIcons = True showIndividualPostIcons = True
manuallyApproveFollowers = \ manuallyApproveFollowers = \
followerApprovalActive(baseDir, followerApprovalActive(baseDir,
self.postToNickname, domain) nickname, domain)
individualPostAsHtml(self.server.signingPrivateKeyPem, False, individualPostAsHtml(self.server.signingPrivateKeyPem, False,
self.server.recentPostsCache, self.server.recentPostsCache,
self.server.maxRecentPosts, self.server.maxRecentPosts,
@ -7860,7 +7860,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.session, self.server.session,
self.server.cachedWebfingers, self.server.cachedWebfingers,
self.server.personCache, self.server.personCache,
self.postToNickname, domain, nickname, domain,
self.server.port, mutePostJson, self.server.port, mutePostJson,
None, True, None, True,
self.server.allowDeletion, self.server.allowDeletion,