bb

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("/<path:path>", subdomain="www")
-@app.route("/<path:path>", subdomain="old")
-def sub_redirect2(path):
-    return redirect(f"https://{app.config['SERVER_NAME']}{request.full_path}")
-
 from files.routes import *

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
 

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}<a href="/id/{user.id}"><img alt="@{user.username}'s profile picture" loading="lazy" src="/uid/{user.id}/pic" class="pp20">@{user.username}</a>'''
 			
 	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}<a href="/id/{user.id}">@{user.username}</a>'
 			
 	def render_sub_mention(self, token):

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])

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