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-09-13 20:38:15 +01:00
parent 7dd906da58
commit fe99792df9
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
person.py
View File

@ -1427,19 +1427,18 @@ def getPersonAvatarUrl(baseDir: str, personUrl: str, personCache: {},
imageExtension = getImageExtensions() imageExtension = getImageExtensions()
for ext in imageExtension: for ext in imageExtension:
if os.path.isfile(avatarImagePath + '.' + ext): imFilename = avatarImagePath + '.' + ext
if ext == 'svg': imPath = '/avatars/' + actorStr + '.' + ext
if not dangerousSVG(avatarImagePath + '.' + ext, False): if not os.path.isfile(imFilename):
return '/avatars/' + actorStr + '.' + ext imFilename = avatarImagePath.lower() + '.' + ext
else: imPath = '/avatars/' + actorStr.lower() + '.' + ext
return '/avatars/' + actorStr + '.' + ext if not os.path.isfile(imFilename):
elif os.path.isfile(avatarImagePath.lower() + '.' + ext): continue
if ext == 'svg': if ext == 'svg':
if not dangerousSVG(avatarImagePath.lower() + '.' + ext, if not dangerousSVG(imFilename, False):
False): return imPath
return '/avatars/' + actorStr.lower() + '.' + ext else:
else: return imPath
return '/avatars/' + actorStr.lower() + '.' + ext
if personJson.get('icon'): if personJson.get('icon'):
if personJson['icon'].get('url'): if personJson['icon'].get('url'):