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

Revert "No http get for instance actor" 

This reverts commit 8093fe92eb.
merge-requests/30/head
Bob Mottram 2021-08-31 20:17:19 +01:00
parent 8093fe92eb
commit d2b5b20307
1 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
daemon.py
View File

@ -11159,6 +11159,29 @@ class PubServer(BaseHTTPRequestHandler):
self.path.replace('/users/' + nickname + '/',
'/users/' + nickname + '/statuses/')
# instance actor
if self.path == '/actor' or \
self.path == '/users/actor' or \
self.path == '/Actor' or \
self.path == '/users/Actor':
self.path = '/users/inbox'
if self._showInstanceActor(callingDomain, self.path,
self.server.baseDir,
self.server.httpPrefix,
self.server.domain,
self.server.domainFull,
self.server.port,
self.server.onionDomain,
self.server.i2pDomain,
GETstartTime, GETtimings,
self.server.proxyType,
None, self.server.debug,
self.server.enableSharedInbox):
return
else:
self._404()
return
# turn off dropdowns on new post screen
noDropDown = False
if self.path.endswith('?nodropdown'):
@ -11462,30 +11485,6 @@ class PubServer(BaseHTTPRequestHandler):
self._benchmarkGETtimings(GETstartTime, GETtimings,
'create session', 'hasAccept')
# instance actor
if not httpGET:
if self.path == '/actor' or \
self.path == '/users/actor' or \
self.path == '/Actor' or \
self.path == '/users/Actor':
self.path = '/users/inbox'
if self._showInstanceActor(callingDomain, self.path,
self.server.baseDir,
self.server.httpPrefix,
self.server.domain,
self.server.domainFull,
self.server.port,
self.server.onionDomain,
self.server.i2pDomain,
GETstartTime, GETtimings,
self.server.proxyType,
None, self.server.debug,
self.server.enableSharedInbox):
return
else:
self._404()
return
# get css
# Note that this comes before the busy flag to avoid conflicts
if self.path.endswith('.css'):