Refactored mention sanitization (stolen commit from themotte)

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

@@ -181,23 +181,29 @@ def sanitize(sanitized, alert=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:
+				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)
 
-		for i in mention_regex.finditer(sanitized):
-			u = get_user(i.group(2), graceful=True)
+		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)
 
-			if u and (not (g.v and g.v.any_block_exists(u)) or g.v.admin_level > 1):
+		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)