From 7515a219696e6bb4a8af6226fecaf8aa5a15e3ff Mon Sep 17 00:00:00 2001 From: justcool393 Date: Thu, 13 Apr 2023 22:17:02 -0500 Subject: [PATCH] unstomp on `is_notification_page` --- files/templates/comments.html | 53 ++++++++++++++++++----------------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/files/templates/comments.html b/files/templates/comments.html index 6279858c1..dd2fbca68 100644 --- a/files/templates/comments.html +++ b/files/templates/comments.html @@ -9,8 +9,8 @@ {%- set ups = c.upvotes_str(render_ctx) -%} {%- set score = c.score_str(render_ctx) -%} {%- set downs = c.downvotes_str(render_ctx) -%} - {% set replies = c.replies(v) %} + {%- set is_notification_page = request.path.startswith('/notifications') -%} {% if not c.visibility_state(v)[0] %} {% if c.show_descendants(v) %} @@ -120,35 +120,36 @@ - {% endif %} + {% endif %} + + + {% if v and v.id != c.author_id and c.body %} + + {% endif %} + + {%- include 'component/comment/replybox_comment.html' -%} + + {% if render_replies %} + {% if level <= RENDER_DEPTH_LIMIT - 1 or is_notification_page %} +
+ {% for reply in replies %} + {{single_comment(reply, level=level+1)}} + {% endfor %}
+ {% elif replies %} +
+ + More comments +
+ {% endif %} - {% if v and v.id != c.author_id and c.body %} - - {% endif %} - - {%- include 'component/comment/replybox_comment.html' -%} - - {% if render_replies %} - {% if level <= RENDER_DEPTH_LIMIT - 1 or is_notification_page %} -
- {% for reply in replies %} - {{single_comment(reply, level=level+1)}} - {% endfor %} -
- {% elif replies %} -
- - More comments -
- {% endif %} - - {% if is_notification_page and c.level == 1 and c.sentto and not c.parent_submission and c.author_id not in (NOTIFICATIONS_ID, AUTOJANNY_ID) %} + {% if is_notification_page and c.level == 1 and c.is_strict_message and c.author_id not in (NOTIFICATIONS_ID, AUTOJANNY_ID) %} + Reply {%- include 'component/comment/replybox_message.html' -%} {% endif %} - {% else %} -
- {% endif %} + {% else %} +
+ {% endif %} {%- include 'component/comment/actions_mobile.html' -%}