From 2d817b696a799e9615f1ab5ad45d8e999d4ec064 Mon Sep 17 00:00:00 2001
From: Aevann <randomname42029@gmail.com>
Date: Tue, 25 Jun 2024 21:54:47 +0300
Subject: [PATCH] highlight !everyone and !jannies mentions in chats

---
 files/classes/user.py            | 9 +++++++--
 files/templates/util/macros.html | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/files/classes/user.py b/files/classes/user.py
index 037d3a413..2a07f6d7f 100644
--- a/files/classes/user.py
+++ b/files/classes/user.py
@@ -995,10 +995,15 @@ class User(Base):
 	@property
 	@lazy
 	def group_memberships_names(self):
-		return [x[0] for x in g.db.query(GroupMembership.group_name).filter(
+		names = [x[0] for x in g.db.query(GroupMembership.group_name).filter(
 				GroupMembership.user_id == self.id,
 				GroupMembership.approved_utc != None,
-			).order_by(GroupMembership.group_name).all()]
+			).order_by(GroupMembership.group_name).all()] + ['everyone']
+
+		if self.admin_level > 0:
+			names.append('jannies')
+
+		return names
 
 	@lazy
 	def has_follower(self, user):
diff --git a/files/templates/util/macros.html b/files/templates/util/macros.html
index e2476a347..a14c9827d 100644
--- a/files/templates/util/macros.html
+++ b/files/templates/util/macros.html
@@ -294,7 +294,7 @@
 	{% set ns = namespace() %}
 	{% if not mentioned %}
 		{% for group_name in group_memberships_names %}
-			{% if '<a href="/!' ~ group_name ~ '"' in m.text_html %}
+			{% if (group_name == 'everyone' and '<a href="/users"' in m.text_html) or (group_name == 'jannies' and '<a href="/admins"' in m.text_html) or '<a href="/!' ~ group_name ~ '"' in m.text_html %}
 				{% set ns.group_mentioned = True %}
 			{% endif %}
 		{% endfor %}