Accept varying avatar filenames

merge-requests/6/head
Bob Mottram 2020-01-19 23:09:37 +00:00
parent aa2128f51b
commit 59f0663898
1 changed files with 7 additions and 0 deletions

View File

@ -1353,6 +1353,13 @@ class PubServer(BaseHTTPRequestHandler):
if '/' in avatarStr and '.temp.' not in self.path: if '/' in avatarStr and '.temp.' not in self.path:
avatarNickname=avatarStr.split('/')[0] avatarNickname=avatarStr.split('/')[0]
avatarFile=avatarStr.split('/')[1] avatarFile=avatarStr.split('/')[1]
# remove any numbers, eg. avatar123.png becomes avatar.png
if avatarFile.startswith('avatar'):
if avatarFile.endswith('.png') or \
avatarFile.endswith('.jpg') or \
avatarFile.endswith('.gif') or \
avatarFile.endswith('.webp'):
avatarFile='avatar.'+avatarFile.split('.')[1]
avatarFilename= \ avatarFilename= \
self.server.baseDir+'/accounts/'+ \ self.server.baseDir+'/accounts/'+ \
avatarNickname+'@'+ \ avatarNickname+'@'+ \