highlight !everyone and !jannies mentions in chats
parent
32aea58598
commit
2d817b696a
|
@ -995,10 +995,15 @@ class User(Base):
|
||||||
@property
|
@property
|
||||||
@lazy
|
@lazy
|
||||||
def group_memberships_names(self):
|
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.user_id == self.id,
|
||||||
GroupMembership.approved_utc != None,
|
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
|
@lazy
|
||||||
def has_follower(self, user):
|
def has_follower(self, user):
|
||||||
|
|
|
@ -294,7 +294,7 @@
|
||||||
{% set ns = namespace() %}
|
{% set ns = namespace() %}
|
||||||
{% if not mentioned %}
|
{% if not mentioned %}
|
||||||
{% for group_name in group_memberships_names %}
|
{% 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 %}
|
{% set ns.group_mentioned = True %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
|
|
Loading…
Reference in New Issue