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

mute/unmute options

merge-requests/30/head
Bob Mottram 2021-09-28 15:37:54 +01:00
parent 0766e8b1d6
commit c53f0631bf
1 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
daemon.py
View File

@ -8022,22 +8022,29 @@ class PubServer(BaseHTTPRequestHandler):
muteFilename = \ muteFilename = \
locatePost(baseDir, nickname, domain, muteUrl) locatePost(baseDir, nickname, domain, muteUrl)
if muteFilename: if muteFilename:
print('Regenerating html post for changed mute status') print('mutePost: 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, nickname, getCachedPostFilename(baseDir, nickname,
domain, mutePostJson) domain, mutePostJson)
print('Muted post json: ' + str(mutePostJson)) print('mutePost: Muted post json: ' + str(mutePostJson))
print('Muted post nickname: ' + print('mutePost: Muted post nickname: ' +
nickname + ' ' + domain) nickname + ' ' + domain)
print('Muted post cache: ' + str(cachedPostFilename)) print('mutePost: Muted post cache: ' + str(cachedPostFilename))
showIndividualPostIcons = True showIndividualPostIcons = True
manuallyApproveFollowers = \ manuallyApproveFollowers = \
followerApprovalActive(baseDir, followerApprovalActive(baseDir,
nickname, domain) nickname, domain)
showRepeats = not isDM(mutePostJson) showRepeats = not isDM(mutePostJson)
individualPostAsHtml(self.server.signingPrivateKeyPem, False, showPublicOnly = False
storeToCache = True
useCacheOnly = False
allowDownloads = True
showAvatarOptions = True
avatarUrl = None
individualPostAsHtml(self.server.signingPrivateKeyPem,
allowDownloads,
self.server.recentPostsCache, self.server.recentPostsCache,
self.server.maxRecentPosts, self.server.maxRecentPosts,
self.server.translate, self.server.translate,
@ -8047,7 +8054,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.personCache, self.server.personCache,
nickname, domain, nickname, domain,
self.server.port, mutePostJson, self.server.port, mutePostJson,
None, True, avatarUrl, showAvatarOptions,
self.server.allowDeletion, self.server.allowDeletion,
httpPrefix, httpPrefix,
self.server.projectVersion, timelineStr, self.server.projectVersion, timelineStr,
@ -8062,7 +8069,8 @@ class PubServer(BaseHTTPRequestHandler):
showRepeats, showRepeats,
showIndividualPostIcons, showIndividualPostIcons,
manuallyApproveFollowers, manuallyApproveFollowers,
False, True, False) showPublicOnly, storeToCache,
useCacheOnly)
else: else:
print('WARN: Muted post not found: ' + muteFilename) print('WARN: Muted post not found: ' + muteFilename)
@ -8137,7 +8145,14 @@ class PubServer(BaseHTTPRequestHandler):
manuallyApproveFollowers = \ manuallyApproveFollowers = \
followerApprovalActive(baseDir, nickname, domain) followerApprovalActive(baseDir, nickname, domain)
showRepeats = not isDM(mutePostJson) showRepeats = not isDM(mutePostJson)
individualPostAsHtml(self.server.signingPrivateKeyPem, False, showPublicOnly = False
storeToCache = True
useCacheOnly = False
allowDownloads = True
showAvatarOptions = True
avatarUrl = None
individualPostAsHtml(self.server.signingPrivateKeyPem,
allowDownloads,
self.server.recentPostsCache, self.server.recentPostsCache,
self.server.maxRecentPosts, self.server.maxRecentPosts,
self.server.translate, self.server.translate,
@ -8147,7 +8162,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.personCache, self.server.personCache,
nickname, domain, nickname, domain,
self.server.port, mutePostJson, self.server.port, mutePostJson,
None, True, avatarUrl, showAvatarOptions,
self.server.allowDeletion, self.server.allowDeletion,
httpPrefix, httpPrefix,
self.server.projectVersion, timelineStr, self.server.projectVersion, timelineStr,
@ -8162,7 +8177,8 @@ class PubServer(BaseHTTPRequestHandler):
showRepeats, showRepeats,
showIndividualPostIcons, showIndividualPostIcons,
manuallyApproveFollowers, manuallyApproveFollowers,
False, True, False) showPublicOnly, storeToCache,
useCacheOnly)
else: else:
print('WARN: Unmuted post not found: ' + muteFilename) print('WARN: Unmuted post not found: ' + muteFilename)
self.server.GETbusy = False self.server.GETbusy = False