Merge pull request #108 from themotte/fix_profile_image_performance

Fix profile image performance

files/assets/js/marked.custom.js

@@ -29,6 +29,30 @@ marked.use({
 				const content = this.parser.parseInline(token.tokens);
 				return `<span class="spoiler">${content}</span>`;
 			}
+		},
+		{
+			name: 'mention',
+			level: 'inline',
+			start: function(src){
+				const match = src.match(/@[a-zA-Z0-9_\-]+/);
+				return match != null ? match.index : -1;
+			},
+			tokenizer: function(src) {
+				const rule  = /^@[a-zA-Z0-9_\-]+/;
+				const match = rule.exec(src);
+				if(match){
+					return {
+						type: 'mention',
+						raw:  match[0],
+						text: match[0].trim().slice(1),
+						tokens: []
+					};
+				}
+			},
+			renderer(token) {
+				const u = token.raw;
+				return `<a href="/${u}"><img src="/${u}/pic" class="pp20"> ${u}</a>`;
+			}
 		}
 	]
 });

files/helpers/get.py

@@ -63,6 +63,29 @@ def get_user(username, v=None, graceful=False):
 
 	return user
 
+def get_users(usernames, v=None, graceful=False):
+	if not usernames:
+		if not graceful: abort(404)
+		else: return []
+
+	def clean(n):
+		return n.replace('\\', '').replace('_', '\_').replace('%', '').strip()
+
+	usernames = [ clean(n) for n in usernames ]
+
+	users = g.db.query(User).filter(
+		or_(
+			User.username == any_(usernames),
+			User.original_username == any_(usernames)
+			)
+		).all()
+
+	if not users:
+		if not graceful: abort(404)
+		else: return []
+
+	return users
+
 def get_account(id, v=None):
 
 	try: id = int(id)

files/helpers/sanitize.py

@@ -144,29 +144,30 @@ def sanitize(sanitized, alert=False, comment=False, edit=False):
 	sanitized = sanitized.replace('‎','').replace('​','').replace("\ufeff", "").replace("𒐪","")
 
 	if alert:
-		captured = []
-		for i in mention_regex2.finditer(sanitized):
-			if i.group(0) in captured: continue
-			captured.append(i.group(0))
+		matches = { g.group(1):g for g in mention_regex2.finditer(sanitized) if g }
+		users = get_users(matches.keys(),graceful=True)
 
-			u = get_user(i.group(1), graceful=True)
+		captured = []
+		for u in users:
 			if u:
-				sanitized = sanitized.replace(i.group(0), f'''<p><a href="/id/{u.id}"><img loading="lazy" src="/pp/{u.id}">@{u.username}</a>''')
+				i = matches.get(u.username) or matches.get(u.original_username)
+				if i.group(0) not in captured:
+					captured.append(i.group(0))
+					sanitized = sanitized.replace(i.group(0), f'''<p><a href="/id/{u.id}"><img loading="lazy" src="/pp/{u.id}">@{u.username}</a>''')
 	else:
 		sanitized = reddit_regex.sub(r'\1<a href="https://old.reddit.com/\2" rel="nofollow noopener noreferrer">/\2</a>', sanitized)
-
 		sanitized = sub_regex.sub(r'\1<a href="/\2">/\2</a>', sanitized)
 
-		captured = []
-		for i in mention_regex.finditer(sanitized):
-			if i.group(0) in captured: continue
-			captured.append(i.group(0))
-
-			u = get_user(i.group(2), graceful=True)
-
-			if u and (not (g.v and g.v.any_block_exists(u)) or g.v.admin_level > 1):
-				sanitized = sanitized.replace(i.group(0), f'''{i.group(1)}<a href="/id/{u.id}"><img loading="lazy" src="/pp/{u.id}">@{u.username}</a>''')
+		matches = [ m for m in mention_regex.finditer(sanitized) if m ]
+		names = set( m.group(2) for m in matches )
+		users = get_users(names,graceful=True)
 
+		for u in users:
+			if not u: continue
+			m = [ m for m in matches if u.username == m.group(2) or u.original_username == m.group(2) ]
+			for i in m:
+				if not (g.v and g.v.any_block_exists(u)) or g.v.admin_level > 1:
+					sanitized = sanitized.replace(i.group(0), f'''{i.group(1)}<a href="/id/{u.id}"><img loading="lazy" src="/pp/{u.id}">@{u.username}</a>''', 1)
 
 	sanitized = imgur_regex.sub(r'\1_d.webp?maxwidth=9999&fidelity=high', sanitized)
 

files/routes/users.py

@@ -1079,6 +1079,9 @@ def remove_follow(username, v):
 
 	return {"message": "Follower removed!"}
 
+from urllib.parse import urlparse
+import re
+
 @app.get("/pp/<id>")
 @app.get("/uid/<id>/pic")
 @app.get("/uid/<id>/pic/profile")
@@ -1090,15 +1093,54 @@ def user_profile_uid(v, id):
 		try: id = int(id, 36)
 		except: abort(404)
 
-	x=get_account(id)
-	return redirect(x.profile_url)
+	name = f"/pp/{id}"
+	path = cache.get(name)
+	tout = 5 * 60 # 5 min
+
+	# if the path isn't cached then make it
+	if not path:
+		user = get_account(id)
+		path = urlparse(user.profile_url).path
+		cache.set(name,path,timeout=tout)
+
+	# if not found, search relative to the root
+	if not os.path.exists(path):
+		path = os.path.join(app.root_path,path.lstrip('/'))
+		cache.set(name,path,timeout=tout)
+
+	# if not found, fail
+	if not os.path.exists(path):
+		cache.set(name,None)
+		abort(404)
+
+	return send_file(path)
 
 @app.get("/@<username>/pic")
 @limiter.exempt
 @auth_required
 def user_profile_name(v, username):
-	x = get_user(username)
-	return redirect(x.profile_url)
+
+	name = f"/@{username}/pic"
+	path = cache.get(name)
+	tout = 5 * 60 # 5 min
+
+	# if the path isn't cached then make it
+	if not path:
+		user = get_user(username)
+		path = urlparse(user.profile_url).path
+		cache.set(name,path,timeout=tout)
+
+	# if not found, search relative to the root
+	if not os.path.exists(path):
+		path = os.path.join(app.root_path,path.lstrip('/'))
+		cache.set(name,path,timeout=tout)
+
+	# if not found, fail
+	if not os.path.exists(path):
+		cache.set(name,None)
+		abort(404)
+
+	return send_file(path)
 
 @app.get("/@<username>/saved/posts")
 @auth_required

files/templates/sign_up.html

@@ -111,7 +111,7 @@
 												required tabindex="5">
 												<div class="custom-control custom-checkbox mt-4">
 														<input autocomplete="off" type="checkbox" class="custom-control-input" id="termsCheck" required tabindex="6">
-														<label class="custom-control-label terms" for="termsCheck">I accept the <a href="/sidebar" tabindex="8">rules</a></label>
+														<label class="custom-control-label terms" for="termsCheck">I accept the <a href="/rules" tabindex="8">rules</a></label>
 												</div>
 
 												{% if hcaptcha %}

files/templates/submit.html

@@ -12,8 +12,6 @@
 		<meta name="author" content="">
 		<link rel="icon" type="image/png" href="/assets/images/{{SITE_NAME}}/icon.webp?v=1015">
 
-		{% set cc='Country Club' %}
-
 		{% block title %}
 		<title>Create a post - {{SITE_NAME}}</title>
 		{% endblock %}
@@ -133,16 +131,6 @@
 														<label class="custom-control-label" for="private">Draft</label>
 												</div>
 
-												<div class="custom-control custom-checkbox">
-													<input autocomplete="off" type="checkbox" class="custom-control-input" id="club" name="club">
-													<label class="custom-control-label" for="club">{{CC_TITLE}} thread</label>
-												</div>
-
-												<div class="custom-control custom-checkbox">
-														<input onchange='draft(this);' autocomplete="off" type="checkbox" class="custom-control-input" id="ghost" name="ghost" {% if v.coins < 100 %}disabled{% endif %}>
-														<label class="custom-control-label" for="ghost">Ghost Thread (cost: 100 coins)</label>
-												</div>
-
 												<pre>