diff --git a/daemon.py b/daemon.py index c6e6771bd..0e524faac 100644 --- a/daemon.py +++ b/daemon.py @@ -20,6 +20,7 @@ import pyqrcode # for saving images from hashlib import sha256 from hashlib import md5 +from shutil import copyfile from session import createSession from webfinger import webfingerMeta from webfinger import webfingerNodeInfo @@ -10413,6 +10414,10 @@ class PubServer(BaseHTTPRequestHandler): nickname = getNicknameFromActor(path) bannerFilename = \ acctDir(baseDir, nickname, domain) + '/search_banner.png' + if not os.path.isfile(bannerFilename): + if os.path.isfile(baseDir + '/default/search_banner.png'): + copyfile(baseDir + '/default/search_banner.png', + bannerFilename) if os.path.isfile(bannerFilename): if self._etag_exists(bannerFilename): # The file has not changed diff --git a/webapp_utils.py b/webapp_utils.py index e3bbe47e6..75c30bcf3 100644 --- a/webapp_utils.py +++ b/webapp_utils.py @@ -475,16 +475,6 @@ def _getImageFile(baseDir: str, name: str, directory: str, bannerFile = name + '_' + theme + '.' + ext bannerFilename = bannerFilenameTest return bannerFile, bannerFilename - # if not found then use the default image - theme = 'default' - directory = baseDir + '/theme/' + theme - for ext in bannerExtensions: - bannerFileTest = name + '.' + ext - bannerFilenameTest = directory + '/' + bannerFileTest - if os.path.isfile(bannerFilenameTest): - bannerFile = name + '_' + theme + '.' + ext - bannerFilename = bannerFilenameTest - break return bannerFile, bannerFilename