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

Showing banner

merge-requests/8/head
Bob Mottram 2020-12-20 16:11:01 +00:00
parent 9874280ce1
commit d60d7d608c
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
daemon.py
View File

@ -9055,10 +9055,10 @@ class PubServer(BaseHTTPRequestHandler):
self._404()
return True
def _showAvatarOrBackground(self, callingDomain: str, path: str,
baseDir: str, domain: str,
GETstartTime, GETtimings: {}) -> bool:
"""Shows an avatar or profile background image
def _showAvatarOrBanner(self, callingDomain: str, path: str,
baseDir: str, domain: str,
GETstartTime, GETtimings: {}) -> bool:
"""Shows an avatar or banner or profile background image
"""
if '/users/' in path:
if self._pathIsImage(path):
@ -9069,6 +9069,8 @@ class PubServer(BaseHTTPRequestHandler):
# remove any numbers, eg. avatar123.png becomes avatar.png
if avatarFile.startswith('avatar'):
avatarFile = 'avatar.' + avatarFile.split('.')[1]
if avatarFile.startswith('banner'):
avatarFile = 'banner.' + avatarFile.split('.')[1]
elif avatarFile.startswith('image'):
avatarFile = 'image.' + avatarFile.split('.')[1]
avatarFilename = \
@ -10138,10 +10140,10 @@ class PubServer(BaseHTTPRequestHandler):
# show avatar or background image
# Note that this comes before the busy flag to avoid conflicts
if self._showAvatarOrBackground(callingDomain, self.path,
self.server.baseDir,
self.server.domain,
GETstartTime, GETtimings):
if self._showAvatarOrBanner(callingDomain, self.path,
self.server.baseDir,
self.server.domain,
GETstartTime, GETtimings):
return
self._benchmarkGETtimings(GETstartTime, GETtimings,