diff --git a/daemon.py b/daemon.py index fc77b0bd6..716c90b0a 100644 --- a/daemon.py +++ b/daemon.py @@ -12716,7 +12716,24 @@ class PubServer(BaseHTTPRequestHandler): avatarFilename = \ acctDir(baseDir, avatarNickname, domain) + '/' + avatarFile if not os.path.isfile(avatarFilename): - return False + originalExt = avatarFileExt + originalAvatarFile = avatarFile + altExt = getImageExtensions() + altFound = False + for alt in altExt: + if alt == originalExt: + continue + avatarFile = \ + originalAvatarFile.replace('.' + originalExt, + '.' + alt) + avatarFilename = \ + acctDir(baseDir, avatarNickname, domain) + \ + '/' + avatarFile + if os.path.isfile(avatarFilename): + altFound = True + break + if not altFound: + return False if self._etag_exists(avatarFilename): # The file has not changed self._304()