diff --git a/files/helpers/const.py b/files/helpers/const.py
index 8e42ebeda..d06b44532 100644
--- a/files/helpers/const.py
+++ b/files/helpers/const.py
@@ -150,8 +150,6 @@ PERMS = { # Minimum admin_level to perform action.
'ADMIN_CATEGORIES_MANAGE': 3, # create/update/delete categories
'HOLE_CREATE': 0,
'CONTENT_THREADS': 3,
- 'FLAGS_VISIBLE': 0,
- 'FLAGS_VISIBLE_REPORTER': 0,
'FLAGS_REMOVE': 2,
'VOTES_VISIBLE': 0,
'USER_BLOCKS_VISIBLE': 0,
@@ -331,7 +329,6 @@ elif SITE == 'pcmemes.net':
LOTTERY_SINK_RATE = -8
elif SITE == 'watchpeopledie.co':
PERMS['HOLE_CREATE'] = 2
- PERMS['FLAGS_VISIBLE'] = 2
FEATURES['PROCOINS'] = False
@@ -349,7 +346,6 @@ elif SITE == 'watchpeopledie.co':
SNAKES_ID = 32
elif SITE == 'lgbdropthet.com':
PERMS['HOLE_CREATE'] = 3
- PERMS['FLAGS_VISIBLE_REPORTER'] = 2
PERMS['VOTES_VISIBLE'] = 2
PERMS['USER_BLOCKS_VISIBLE'] = 2
PERMS['USER_FOLLOWS_VISIBLE'] = 2
diff --git a/files/templates/comments.html b/files/templates/comments.html
index 3289e645f..2e232fdbd 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -182,7 +182,7 @@
{% if c.bannedfor %}
{% endif %}
- {% if c.active_flags(v) and (v and v.admin_level >= PERMS['FLAGS_VISIBLE']) %}{{c.active_flags(v)}} Report{{ help.plural(c.active_flags(v)) }}{% endif %}
+ {% if c.active_flags(v) %}{{c.active_flags(v)}} Report{{ help.plural(c.active_flags(v)) }}{% endif %}
{% if c.over_18 %}{% endif %}
{% if v and v.admin_level > 1 and c.author.shadowbanned %}{% endif %}
{% if c.stickied %}
@@ -258,13 +258,13 @@
{{c.wordle_html(v) | safe}}
{% endif %}
- {% if c.active_flags(v) and (v and v.admin_level >= PERMS['FLAGS_VISIBLE']) %}
+ {% if c.active_flags(v) %}
Reported by:
{% for f in c.filtered_flags(v) %}
- - {% if v and v.admin_level >= PERMS['FLAGS_VISIBLE_REPORTER'] %}{% if not c.ghost %}{{f.user.username}}{% else %}👻{% endif %}{% else %}User{% endif %}{% if f.reason %}: {{f.realreason(v) | safe}}{% endif %} {% if v and v.admin_level >= PERMS['FLAGS_REMOVE'] %}[remove]{% endif %}
+ - {% if c.ghost %}👻{% else %}{{f.user.username}}{% endif %}{% if f.reason %}: {{f.realreason(v) | safe}}{% endif %} {% if v and v.admin_level >= PERMS['FLAGS_REMOVE'] %}[remove]{% endif %}
{% endfor %}
diff --git a/files/templates/submission.html b/files/templates/submission.html
index 1829c71f2..901ef36e6 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -658,7 +658,7 @@
{% if p.is_bot %} {% endif %}
{% if p.over_18 %}{% endif %}
{% if p.private %}{% endif %}
- {% if p.active_flags(v) and (v and v.admin_level >= PERMS['FLAGS_VISIBLE']) %}{{p.active_flags(v)}} Report{{ help.plural(p.active_flags(v)) }}{% endif %}
+ {% if p.active_flags(v) %}{{p.active_flags(v)}} Report{{ help.plural(p.active_flags(v)) }}{% endif %}
{% if p.ghost %}
👻
@@ -693,13 +693,13 @@
{% endif %}
{{p.views}} thread views
- {% if p.active_flags(v) and (v and v.admin_level >= PERMS['FLAGS_VISIBLE']) %}
+ {% if p.active_flags(v) %}
Reported by:
{% for f in p.filtered_flags(v) %}
- - {% if v and v.admin_level >= PERMS['FLAGS_VISIBLE_REPORTER'] %}{{f.user.username}}{% else %}User{% endif %}{% if f.reason %}: {{f.realreason(v) | safe}}{% endif %} {% if v and v.admin_level >= PERMS['FLAGS_REMOVE'] %}[remove]{% endif %}
+ - {{f.user.username}}{% if f.reason %}: {{f.realreason(v) | safe}}{% endif %} {% if v and v.admin_level >= PERMS['FLAGS_REMOVE'] %}[remove]{% endif %}
{% endfor %}
diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html
index b4f85cdb4..2940ae6b8 100644
--- a/files/templates/submission_listing.html
+++ b/files/templates/submission_listing.html
@@ -72,13 +72,13 @@
{% set v_forbid_deleted = (p.deleted_utc != 0 or p.is_banned) and not (v and v.admin_level >= 2) and not (v and v.id == p.author_id) %}
-{% if p.active_flags(v) and (v and v.admin_level >= PERMS['FLAGS_VISIBLE']) %}
+{% if p.active_flags(v) %}
Reported by:
{% for f in p.filtered_flags(v) %}
- - {% if v and v.admin_level >= PERMS['FLAGS_VISIBLE_REPORTER'] %}{{f.user.username}}{% else %}User{% endif %}{% if f.reason %}: {{f.realreason(v) | safe}}{% endif %} {% if v and v.admin_level >= PERMS['FLAGS_REMOVE'] %}[remove]{% endif %}
+ - {{f.user.username}}{% if f.reason %}: {{f.realreason(v) | safe}}{% endif %} {% if v and v.admin_level >= PERMS['FLAGS_REMOVE'] %}[remove]{% endif %}
{% endfor %}
@@ -194,7 +194,7 @@
{% if p.is_blocking %}{% endif %}
{% if p.is_blocked %}{% endif %}
{% if p.private %}{% endif %}
- {% if p.active_flags(v) and (v and v.admin_level >= PERMS['FLAGS_VISIBLE']) %}{{p.active_flags(v)}} Report{{ help.plural(p.active_flags(v)) }}{% endif %}
+ {% if p.active_flags(v) %}{{p.active_flags(v)}} Report{{ help.plural(p.active_flags(v)) }}{% endif %}
{% if p.ghost %}
👻