diff --git a/files/helpers/sanitize.py b/files/helpers/sanitize.py index c3bd1d1e83..95ff0d3dda 100644 --- a/files/helpers/sanitize.py +++ b/files/helpers/sanitize.py @@ -183,7 +183,7 @@ def sanitize(sanitized, noimages=False): classes = 'height=60 class="emoji-md" ' remoji = emoji - if path.isfile(f'files/static/assets/images/emojis/{remoji}.webp'): + if path.isfile(f'files/assets/images/emojis/{remoji}.webp'): new = re.sub(f'(?', new, flags=re.I) sanitized = sanitized.replace(old, new) @@ -193,10 +193,10 @@ def sanitize(sanitized, noimages=False): emoji = i.group(1).lower() if emoji.startswith("!"): emoji = emoji[1:] - if path.isfile(f'files/static/assets/images/emojis/{emoji}.webp'): + if path.isfile(f'files/assets/images/emojis/{emoji}.webp'): sanitized = re.sub(f'(?', sanitized, flags=re.I) - elif path.isfile(f'files/static/assets/images/emojis/{emoji}.webp'): + elif path.isfile(f'files/assets/images/emojis/{emoji}.webp'): sanitized = re.sub(f'(?', sanitized, flags=re.I) sanitized = sanitized.replace("https://www.", "https://").replace("https://youtu.be/", "https://youtube.com/watch?a=").replace("https://music.youtube.com/watch?a=", "https://youtube.com/watch?a=").replace("https://open.spotify.com/", "https://open.spotify.com/embed/").replace("https://streamable.com/", "https://streamable.com/e/").replace("https://youtube.com/shorts/", "https://youtube.com/watch?a=").replace("https://mobile.twitter", "https://twitter").replace("https://m.facebook", "https://facebook").replace("m.wikipedia.org", "wikipedia.org").replace("https://m.youtube", "https://youtube") @@ -242,10 +242,10 @@ def filter_emojis_only(title): if emoji.startswith("!"): emoji = emoji[1:] - if path.isfile(f'files/static/assets/images/emojis/{emoji}.webp'): + if path.isfile(f'files/assets/images/emojis/{emoji}.webp'): title = re.sub(f'(?', title, flags=re.I) - elif path.isfile(f'files/static/assets/images/emojis/{emoji}.webp'): + elif path.isfile(f'files/assets/images/emojis/{emoji}.webp'): title = re.sub(f'(?', title, flags=re.I) if len(title) > 1500: abort(400) diff --git a/files/routes/static.py b/files/routes/static.py index e020235e27..15c9b4bedc 100644 --- a/files/routes/static.py +++ b/files/routes/static.py @@ -15,7 +15,7 @@ site_name = environ.get("SITE_NAME").strip() @app.get("/emojis") @auth_desired def emojis(v): - emojis = (x.replace('.webp','') for x in os.listdir("files/static/assets/images/emojis")) + emojis = (x.replace('.webp','') for x in os.listdir("files/assets/images/emojis")) if not v or v.oldsite: template = '' else: template = 'CHRISTMAS/' return render_template(f"{template}emojis.html", v=v, emojis=emojis) @@ -388,7 +388,7 @@ def formatting(v): @app.get("/service-worker.js") def serviceworker(): - with open("files/static/assets/js/service-worker.js", "r") as f: return Response(f.read(), mimetype='application/javascript') + with open("files/assets/js/service-worker.js", "r") as f: return Response(f.read(), mimetype='application/javascript') @app.get("/settings/security") @auth_required