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

Moderator can remove blogs from the news actor

main
Bob Mottram 2020-11-27 10:25:10 +00:00
parent 1da5d5769d
commit e3e88de0d8
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
daemon.py
View File

@ -1519,9 +1519,7 @@ class PubServer(BaseHTTPRequestHandler):
moderationText) moderationText)
if postFilename: if postFilename:
if canRemovePost(baseDir, if canRemovePost(baseDir,
nickname, nickname, domain, port,
domain,
port,
moderationText): moderationText):
deletePost(baseDir, deletePost(baseDir,
httpPrefix, httpPrefix,
@ -1529,6 +1527,23 @@ class PubServer(BaseHTTPRequestHandler):
postFilename, postFilename,
debug, debug,
self.server.recentPostsCache) self.server.recentPostsCache)
if nickname != 'news':
# if this is a local blog post then also remove it
# from the news actor
postFilename = \
locatePost(baseDir, 'news', domain,
moderationText)
if postFilename:
if canRemovePost(baseDir,
'news', domain, port,
moderationText):
deletePost(baseDir,
httpPrefix,
'news', domain,
postFilename,
debug,
self.server.recentPostsCache)
if callingDomain.endswith('.onion') and onionDomain: if callingDomain.endswith('.onion') and onionDomain:
actorStr = 'http://' + onionDomain + usersPath actorStr = 'http://' + onionDomain + usersPath
elif (callingDomain.endswith('.i2p') and i2pDomain): elif (callingDomain.endswith('.i2p') and i2pDomain):