mj-saunders
/
epicyon
forked from indymedia/epicyon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Tidying

main2
Bob Mottram 2019-10-31 20:46:37 +00:00
parent 6bf78d35c4
commit e3df836d3b
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
webinterface.py
View File

@ -114,22 +114,23 @@ def getPersonAvatarUrl(baseDir: str,personUrl: str,personCache: {}) -> str:
"""Returns the avatar url for the person """Returns the avatar url for the person
""" """
personJson = getPersonFromCache(baseDir,personUrl,personCache) personJson = getPersonFromCache(baseDir,personUrl,personCache)
if personJson: if not personJson:
# get from locally stored image return None
actorStr=personJson['id'].replace('/','-') # get from locally stored image
avatarImagePath=baseDir+'/cache/avatars/'+actorStr actorStr=personJson['id'].replace('/','-')
if os.path.isfile(avatarImagePath+'.png'): avatarImagePath=baseDir+'/cache/avatars/'+actorStr
return '/avatars/'+actorStr+'.png' if os.path.isfile(avatarImagePath+'.png'):
if os.path.isfile(avatarImagePath+'.jpg'): return '/avatars/'+actorStr+'.png'
return '/avatars/'+actorStr+'.jpg' if os.path.isfile(avatarImagePath+'.jpg'):
if os.path.isfile(avatarImagePath+'.gif'): return '/avatars/'+actorStr+'.jpg'
return '/avatars/'+actorStr+'.gif' if os.path.isfile(avatarImagePath+'.gif'):
if os.path.isfile(avatarImagePath): return '/avatars/'+actorStr+'.gif'
return '/avatars/'+actorStr if os.path.isfile(avatarImagePath):
return '/avatars/'+actorStr
if personJson.get('icon'): if personJson.get('icon'):
if personJson['icon'].get('url'): if personJson['icon'].get('url'):
return personJson['icon']['url'] return personJson['icon']['url']
return None return None
def htmlSearchEmoji(translate: {},baseDir: str,searchStr: str) -> str: def htmlSearchEmoji(translate: {},baseDir: str,searchStr: str) -> str: