diff --git a/files/templates/commenters.html b/files/templates/commenters.html index 899188ac9..0c0f8ac44 100644 --- a/files/templates/commenters.html +++ b/files/templates/commenters.html @@ -12,11 +12,13 @@ {% for user, comment_id, comment_created_utc in users %} - - {{loop.index}} - {% include "user_in_table.html" %} - - + {% if can_see(v, user) %} + + {{loop.index}} + {% include "user_in_table.html" %} + + + {% endif %} {% endfor %} diff --git a/files/templates/emojis.html b/files/templates/emojis.html index 3e60d343c..78965480a 100644 --- a/files/templates/emojis.html +++ b/files/templates/emojis.html @@ -43,8 +43,15 @@ :#{{emoji.name}}: {{emoji.count}} - {% if emoji.author_id == 2 %} + {% if emoji.author_id == 2 or (SITE_NAME == 'WPD' and not can_see(v, emoji.user)) %} a{% if OTHER_SITE_NAME == 'rDrama' %}n{% endif %} {{OTHER_SITE_NAME}} user + {% elif not can_see(v, emoji.user) %} + +
+ +
+ ??? +
{% else %} {% set user = emoji.user %} {% include "user_in_table.html" %} diff --git a/files/templates/grassed.html b/files/templates/grassed.html index ef20c93ba..f9eecaf10 100644 --- a/files/templates/grassed.html +++ b/files/templates/grassed.html @@ -5,17 +5,17 @@ - {% for user in users %} - - - - - + {% if can_see(v, user) %} + + + + + {% endif %} {% endfor %}
# Name Grasser
{{loop.index}}{% include "user_in_table.html" %}{{user.ban_reason.split('by ')[1] | safe}}
{% include "user_in_table.html" %}{{user.ban_reason.split('by ')[1] | safe}}
diff --git a/files/templates/group_memberships.html b/files/templates/group_memberships.html index ffe2e5a6d..387b5fe68 100644 --- a/files/templates/group_memberships.html +++ b/files/templates/group_memberships.html @@ -63,52 +63,54 @@ {% for membership in memberships %} - - {{loop.index}} - {% set is_owner = membership.user_id == group.owner_id %} - - {% with user=membership.user %} - {% include "user_in_table.html" %} - {% endwith %} - {% if is_owner %} - Owner - {% elif membership.is_mod %} - Mod - {% endif %} - + {% if can_see(v, membership.user) %} + + {{loop.index}} + {% set is_owner = membership.user_id == group.owner_id %} + + {% with user=membership.user %} + {% include "user_in_table.html" %} + {% endwith %} + {% if is_owner %} + Owner + {% elif membership.is_mod %} + Mod + {% endif %} + - - {% if v.mods_group(group) %} - {% if v.id == group.owner_id and v.id != membership.user_id %} -
- - + + {% if v.mods_group(group) %} + {% if v.id == group.owner_id and v.id != membership.user_id %} +
+ + +
+ {% endif %} + + {% if v.id == membership.user_id or v.id == group.owner_id or not membership.user.mods_group(group) %} +
+ +
+ {% endif %} + +
+ +
{% endif %} - {% if v.id == membership.user_id or v.id == group.owner_id or not membership.user.mods_group(group) %} -
- -
+ {% if v.is_member_of_group(group) and is_owner and v.id != group.owner_id %} + {% endif %} + -
- - -
+ {% if name == 'members' %} + + {% else %} + {% endif %} - - {% if v.is_member_of_group(group) and is_owner and v.id != group.owner_id %} - - {% endif %} - - - {% if name == 'members' %} - - {% else %} - - {% endif %} - + + {% endif %} {% endfor %} diff --git a/files/templates/leaderboard.html b/files/templates/leaderboard.html index 560c48598..19a033fdd 100644 --- a/files/templates/leaderboard.html +++ b/files/templates/leaderboard.html @@ -57,11 +57,13 @@ {% for user in leaderboard.all_users %} - {% set user2 = leaderboard.user_func(user) %} - {% if v.id == user2.id %} - {% set style="class=\"self\"" %} + {% if can_see(v, user) %} + {% set user2 = leaderboard.user_func(user) %} + {% if v.id == user2.id %} + {% set style="class=\"self\"" %} + {% endif %} + {{format_user_in_table(user2, style, loop.index, leaderboard.value_func(user), leaderboard.user_relative_url)}} {% endif %} - {{format_user_in_table(user2, style, loop.index, leaderboard.value_func(user), leaderboard.user_relative_url)}} {% endfor %} {% if leaderboard.v_position and not leaderboard.v_appears_in_ranking %} {{format_user_in_table(v, "style=\"border-top:2px solid var(--primary)\"", leaderboard.v_position, leaderboard.v_value, leaderboard.user_relative_url)}} diff --git a/files/templates/notification_mutes.html b/files/templates/notification_mutes.html index 8d394f8dd..014062e40 100644 --- a/files/templates/notification_mutes.html +++ b/files/templates/notification_mutes.html @@ -14,19 +14,21 @@ {% for mute in mutes %} - - - {% with user = mute.user %} - {% include "user_in_table.html" %} - {% endwith %} - - - {% with user = mute.target %} - {% include "user_in_table.html" %} - {% endwith %} - - - + {% if can_see(v, mute.user) and can_see(v, mute.target) %} + + + {% with user = mute.user %} + {% include "user_in_table.html" %} + {% endwith %} + + + {% with user = mute.target %} + {% include "user_in_table.html" %} + {% endwith %} + + + + {% endif % {% endfor %}
diff --git a/files/templates/userpage/muters.html b/files/templates/userpage/muters.html index 6e46fdb79..5868a097c 100644 --- a/files/templates/userpage/muters.html +++ b/files/templates/userpage/muters.html @@ -12,10 +12,12 @@ {% for mute, user in users %} - - {% include "user_in_table.html" %} - - + {% if can_see(v, user) %} + + {% include "user_in_table.html" %} + + + {% endif %} {% endfor %} diff --git a/files/templates/userpage/muting.html b/files/templates/userpage/muting.html index ce2b0ca03..e1caab220 100644 --- a/files/templates/userpage/muting.html +++ b/files/templates/userpage/muting.html @@ -15,15 +15,17 @@ {% for mute, user in users %} - - {% include "user_in_table.html" %} - {% if v.id == u.id %} - - - - {% endif %} - - + {% if can_see(v, user) %} + + {% include "user_in_table.html" %} + {% if v.id == u.id %} + + + + {% endif %} + + + {% endif %} {% endfor %} diff --git a/files/templates/userpage/views.html b/files/templates/userpage/views.html index 1cb93e124..d3544266c 100644 --- a/files/templates/userpage/views.html +++ b/files/templates/userpage/views.html @@ -12,14 +12,16 @@ {% for view in views %} - - {{view.last_view_string}} - - {% with user=view.viewer %} - {% include "user_in_table.html" %} - {% endwith %} - - + {% if can_see(v, view.viewer) %} + + {{view.last_view_string}} + + {% with user=view.viewer %} + {% include "user_in_table.html" %} + {% endwith %} + + + {% endif %} {% endfor %}