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

Tidying

merge-requests/30/head
Bob Mottram 2021-07-07 12:03:16 +01:00
parent f294fbd356
commit e65ad3bcc2
1 changed files with 69 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
daemon.py
View File

@ -7832,22 +7832,23 @@ class PubServer(BaseHTTPRequestHandler):
statusNumber = postSections[2] statusNumber = postSections[2]
if len(statusNumber) <= 10 or (not statusNumber.isdigit()): if len(statusNumber) <= 10 or (not statusNumber.isdigit()):
return False return False
postFilename = \ postFilename = \
baseDir + '/accounts/' + \ baseDir + '/accounts/' + nickname + '@' + domain + '/outbox/' + \
nickname + '@' + \ httpPrefix + ':##' + domainFull + '#users#' + nickname + \
domain + '/outbox/' + \ '#statuses#' + statusNumber + '.json'
httpPrefix + ':##' + \ if not os.path.isfile(postFilename):
domainFull + '#users#' + \ self._404()
nickname + '#statuses#' + \ self.server.GETbusy = False
statusNumber + '.json' return True
if os.path.isfile(postFilename):
postJsonObject = loadJson(postFilename) postJsonObject = loadJson(postFilename)
if not postJsonObject: if not postJsonObject:
self.send_response(429) self.send_response(429)
self.end_headers() self.end_headers()
self.server.GETbusy = False self.server.GETbusy = False
return True return True
else:
# Only authorized viewers get to see likes # Only authorized viewers get to see likes
# on posts # on posts
# Otherwize marketers could gain more social # Otherwize marketers could gain more social
@ -7859,52 +7860,27 @@ class PubServer(BaseHTTPRequestHandler):
self.server.GETbusy = False self.server.GETbusy = False
return True return True
removePostInteractions(pjo, True) removePostInteractions(pjo, True)
if self._requestHTTP(): if self._requestHTTP():
recentPostsCache = \
self.server.recentPostsCache
maxRecentPosts = \
self.server.maxRecentPosts
translate = \
self.server.translate
cachedWebfingers = \
self.server.cachedWebfingers
personCache = \
self.server.personCache
projectVersion = \
self.server.projectVersion
ytDomain = \
self.server.YTReplacementDomain
showPublishedDateOnly = \
self.server.showPublishedDateOnly
peertubeInstances = \
self.server.peertubeInstances
allowLocalNetworkAccess = \
self.server.allowLocalNetworkAccess
themeName = \
self.server.themeName
msg = \ msg = \
htmlIndividualPost(self.server.cssCache, htmlIndividualPost(self.server.cssCache,
recentPostsCache, self.server.recentPostsCache,
maxRecentPosts, self.server.maxRecentPosts,
translate, self.server.translate,
baseDir, baseDir,
self.server.session, self.server.session,
cachedWebfingers, self.server.cachedWebfingers,
personCache, self.server.personCache,
nickname, nickname, domain, port,
domain,
port,
authorized, authorized,
postJsonObject, postJsonObject,
httpPrefix, httpPrefix,
projectVersion, self.server.projectVersion,
likedBy, likedBy,
ytDomain, self.server.YTReplacementDomain,
showPublishedDateOnly, self.server.showPublishedDateOnly,
peertubeInstances, self.server.peertubeInstances,
allowLocalNetworkAccess, self.server.allowLocalNetworkAccess,
themeName) self.server.themeName)
msg = msg.encode('utf-8') msg = msg.encode('utf-8')
msglen = len(msg) msglen = len(msg)
self._set_headers('text/html', msglen, self._set_headers('text/html', msglen,
@ -7929,11 +7905,6 @@ class PubServer(BaseHTTPRequestHandler):
self._404() self._404()
self.server.GETbusy = False self.server.GETbusy = False
return True return True
else:
self._404()
self.server.GETbusy = False
return True
return False
def _showInbox(self, authorized: bool, def _showInbox(self, authorized: bool,
callingDomain: str, path: str, callingDomain: str, path: str,