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

Less indentation

merge-requests/30/head
Bob Mottram 2021-07-07 12:31:43 +01:00
parent e65ad3bcc2
commit f6355632ec
1 changed files with 78 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
daemon.py
View File

@ -7700,21 +7700,25 @@ class PubServer(BaseHTTPRequestHandler):
if '/' not in namedStatus: if '/' not in namedStatus:
# show actor # show actor
nickname = namedStatus nickname = namedStatus
else: return False
postSections = namedStatus.split('/') postSections = namedStatus.split('/')
if len(postSections) == 2: if len(postSections) != 2:
return False
nickname = postSections[0] nickname = postSections[0]
statusNumber = postSections[1] statusNumber = postSections[1]
if len(statusNumber) > 10 and statusNumber.isdigit(): if len(statusNumber) <= 10 or not statusNumber.isdigit():
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)
loadedPost = False loadedPost = False
if postJsonObject: if postJsonObject:
@ -7733,51 +7737,26 @@ class PubServer(BaseHTTPRequestHandler):
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
cssCache = self.server.cssCache
allowLocalNetworkAccess = \
self.server.allowLocalNetworkAccess
themeName = \
self.server.themeName
msg = \ msg = \
htmlIndividualPost(cssCache, htmlIndividualPost(self.server.cssCache,
recentPostsCache, self.server.recentPostsCache,
maxRecentPosts, self.server.maxRecentPosts,
translate, self.server.translate,
self.server.baseDir, self.server.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,
@ -7800,11 +7779,6 @@ class PubServer(BaseHTTPRequestHandler):
'new post done', 'new post done',
'individual post shown') 'individual post shown')
return True return True
else:
self._404()
self.server.GETbusy = False
return True
return False
def _showIndividualPost(self, authorized: bool, def _showIndividualPost(self, authorized: bool,
callingDomain: str, path: str, callingDomain: str, path: str,