diff --git a/files/assets/js/markdown.js b/files/assets/js/markdown.js index b03b2516f..c45850293 100644 --- a/files/assets/js/markdown.js +++ b/files/assets/js/markdown.js @@ -101,7 +101,7 @@ function markdown(t) { const emojiClass = old.indexOf('#') == -1 ? 'emoji' : 'emoji-lg'; if (emoji.endsWith('pat') && emoji != 'marseyunpettablepat') { emoji = emoji.substr(0, emoji.length - 3); - const url = old.indexOf('@') != -1 ? `/@${emoji}/pic` : `/e/${emoji}.webp`; + const url = old.indexOf('@') != -1 ? `/@${emoji}/pic` : `${SITE_FULL_IMAGES}/e/${emoji}.webp`; input = input.replace(old, ``); } else { input = input.replace(old, ``); diff --git a/files/routes/asset_submissions.py b/files/routes/asset_submissions.py index 2c9608ea1..c91a0cb7b 100644 --- a/files/routes/asset_submissions.py +++ b/files/routes/asset_submissions.py @@ -189,7 +189,7 @@ def approve_emoji(v, name): cache.delete("emojis") cache.delete("emoji_list") - purge_files_in_cache(f"https://{SITE}/e/{emoji.name}/webp") + purge_files_in_cache(f"{SITE_FULL_IMAGES}/e/{emoji.name}/webp") move(f"/asset_submissions/emojis/{name}.webp", f"files/assets/images/emojis/{emoji.name}.webp") @@ -465,7 +465,7 @@ def update_emoji(v): filename = f"files/assets/images/emojis/{name}.webp" copyfile(new_path, filename) process_image(filename, v, resize=200, trim=True) - purge_files_in_cache([f"https://{SITE}/e/{name}.webp", f"https://{SITE}/assets/images/emojis/{name}.webp", f"https://{SITE}/asset_submissions/emojis/original/{name}.{format}"]) + purge_files_in_cache([f"{SITE_FULL_IMAGES}/e/{name}.webp", f"{SITE_FULL_IMAGES}/asset_submissions/emojis/original/{name}.{format}"]) updated = True @@ -552,7 +552,7 @@ def update_hat(v): filename = f"files/assets/images/hats/{name}.webp" copyfile(new_path, filename) process_image(filename, v, resize=100) - purge_files_in_cache([f"https://{SITE}/i/hats/{name}.webp", f"https://{SITE}/assets/images/hats/{name}.webp", f"https://{SITE}/asset_submissions/hats/original/{name}.{format}"]) + purge_files_in_cache([f"{SITE_FULL_IMAGES}/i/hats/{name}.webp", f"{SITE_FULL_IMAGES}/asset_submissions/hats/original/{name}.{format}"]) ma = ModAction( kind="update_hat", user_id=v.id, diff --git a/files/routes/comments.py b/files/routes/comments.py index ec0d61d94..736ee6f47 100644 --- a/files/routes/comments.py +++ b/files/routes/comments.py @@ -216,7 +216,7 @@ def comment(v:User): filename = f'files/assets/images/{SITE_NAME}/badges/{badge.id}.webp' copyfile(oldname, filename) process_image(filename, v, resize=300, trim=True) - purge_files_in_cache(f"https://{SITE}/assets/images/{SITE_NAME}/badges/{badge.id}.webp") + purge_files_in_cache(f"{SITE_FULL_IMAGES}/i/{SITE_NAME}/badges/{badge.id}.webp") except Exception as e: abort(400, str(e)) body = body.replace(f'[{file.filename}]', f' {image} ', 1)