From b446532ad2990912a6d4e3aa9a9a274eb3faf993 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Sun, 9 Jan 2022 23:06:21 +0200 Subject: [PATCH] bb --- files/__main__.py | 13 +++---------- files/helpers/alerts.py | 4 +++- files/helpers/markdown.py | 4 ---- files/helpers/wrappers.py | 4 ---- files/routes/front.py | 3 --- 5 files changed, 6 insertions(+), 22 deletions(-) diff --git a/files/__main__.py b/files/__main__.py index a8aa98fe3..24e85f6f9 100644 --- a/files/__main__.py +++ b/files/__main__.py @@ -100,6 +100,9 @@ def before_request(): g.timestamp = int(time.time()) + session.permanent = True + if not session.get("session_id"): session["session_id"] = secrets.token_hex(49) + if '; wv) ' in request.headers.get("User-Agent",""): g.webview = True else: g.webview = False @@ -115,14 +118,4 @@ def after_request(response): response.headers.add("X-Frame-Options", "deny") return response -@app.route("/", subdomain="www") -@app.route("/", subdomain="old") -def sub_redirect(): - return redirect(f"https://{app.config['SERVER_NAME']}") - -@app.route("/", subdomain="www") -@app.route("/", subdomain="old") -def sub_redirect2(path): - return redirect(f"https://{app.config['SERVER_NAME']}{request.full_path}") - from files.routes import * \ No newline at end of file diff --git a/files/helpers/alerts.py b/files/helpers/alerts.py index 54b63d0f7..f955350da 100644 --- a/files/helpers/alerts.py +++ b/files/helpers/alerts.py @@ -104,7 +104,9 @@ def NOTIFY_USERS(text, v): soup = BeautifulSoup(text, features="html.parser") for mention in soup.find_all("a", href=re.compile("^\/id\/([0-9]+)")): id = int(mention["href"].split("/id/")[1]) - if id != v.id: notify_users.add(id) + if id != v.id: + user = g.db.query(User).filter_by(id=id).one_or_none() + if user and not v.any_block_exists(user): notify_users.add(user.id) return notify_users diff --git a/files/helpers/markdown.py b/files/helpers/markdown.py index c6dfc1efa..d83f187bc 100644 --- a/files/helpers/markdown.py +++ b/files/helpers/markdown.py @@ -39,8 +39,6 @@ class CustomRenderer(HTMLRenderer): user = get_user(target, graceful=True) - if not user or g.v.admin_level == 0 and g.v.any_block_exists(user): return f"{space}@{target}" - return f'''{space}@{user.username}'s profile picture@{user.username}''' def render_sub_mention(self, token): @@ -66,8 +64,6 @@ class Renderer(HTMLRenderer): user = get_user(target, graceful=True) - if not user or g.v.admin_level == 0 and g.v.any_block_exists(user): return f"{space}@{target}" - return f'{space}@{user.username}' def render_sub_mention(self, token): diff --git a/files/helpers/wrappers.py b/files/helpers/wrappers.py index e76e82ba2..613eed6e1 100644 --- a/files/helpers/wrappers.py +++ b/files/helpers/wrappers.py @@ -43,7 +43,6 @@ def auth_desired(f): def wrapper(*args, **kwargs): v = get_logged_in_user() - g.v = v check_ban_evade(v) @@ -61,7 +60,6 @@ def auth_required(f): v = get_logged_in_user() if not v: abort(401) - g.v = v check_ban_evade(v) resp = make_response(f(*args, v=v, **kwargs)) @@ -79,7 +77,6 @@ def is_not_permabanned(f): if not v: abort(401) - g.v = v check_ban_evade(v) if v.is_banned and v.unban_utc == 0: @@ -104,7 +101,6 @@ def admin_level_required(x): if v.admin_level < x: abort(403) - g.v = v response = f(*args, v=v, **kwargs) if isinstance(response, tuple): resp = make_response(response[0]) diff --git a/files/routes/front.py b/files/routes/front.py index 50f448979..5ee486429 100644 --- a/files/routes/front.py +++ b/files/routes/front.py @@ -123,9 +123,6 @@ def notifications(v): @auth_desired def front_all(v): - session.permanent = True - if not session.get("session_id"): session["session_id"] = secrets.token_hex(49) - if not v and request.path == "/" and not request.headers.get("Authorization"): return redirect(f"/logged_out{request.full_path}") if v and request.path.startswith('/logged_out'): v = None