diff --git a/files/routes/comments.py b/files/routes/comments.py index 53c4c8f86..f1036e308 100644 --- a/files/routes/comments.py +++ b/files/routes/comments.py @@ -83,6 +83,9 @@ def post_pid_comment_cid(cid, pid=None, anything=None, v=None): blocked.c.user_id == Comment.author_id, isouter=True ) + + # TODO (wmill) This looks wrong to me. It adds on new properties to all comments to use voted/blocked/blocking status in rendering. + # But it needs to be repeated if you ever want to render comments anywhere else. output = [] for c in comments: diff --git a/files/routes/front.py b/files/routes/front.py index 415d998c2..07c084249 100644 --- a/files/routes/front.py +++ b/files/routes/front.py @@ -62,10 +62,13 @@ def notifications_main(v: User): next_exists = (len(comments) > 25) comments = comments[:25] + user_blocking = [row.target_id for row in g.db.query(UserBlock).filter_by(user_id=v.id)] + for c, n in comments: c.notif_utc = n.created_utc c.unread = not n.read n.read = True + c.is_blocking = c.author_id in user_blocking listing: list[Comment] = [c for c, _ in comments] diff --git a/files/templates/comments.html b/files/templates/comments.html index 6ceef0d21..1e2dfb5bd 100644 --- a/files/templates/comments.html +++ b/files/templates/comments.html @@ -12,141 +12,141 @@ {% set replies = c.replies(v) %} {% if not c.visibility_and_message(v)[0] %} -{% if c.show_descendants(v) %} -
-
-
-
-
- -
- {% if standalone and c.over_18 %}+18{% endif %} - {{c.visibility_and_message(v)[1]}} -
- -
-
- {% if render_replies %} -
- {% if level <= RENDER_DEPTH_LIMIT - 1 %} - {% set standalone=false %} - {% for reply in replies %} - {{single_comment(reply, level=level+1)}} - {% endfor %} - {% endif %} -
- {% if replies and level >= RENDER_DEPTH_LIMIT -%} -
- {% if not is_notification_page %}{% endif %} - More comments + {% if c.show_descendants(v) or is_notification_page %} +
+
+
+
+
+ + + +
+
+ {% if render_replies %} +
+ {% if level <= RENDER_DEPTH_LIMIT - 1 %} + {% set standalone=false %} + {% for reply in replies %} + {{single_comment(reply, level=level+1)}} + {% endfor %} + {% endif %} +
+ {% if replies and level >= RENDER_DEPTH_LIMIT -%} +
+ {% if not is_notification_page %}{% endif %} + More comments +
+ {% endif %} + {% endif %}
- {%- endif %} - {% endif %}
-
-{% endif %} + {% endif %} {% else %} -{%- set voted = c.voted_display(v) -%} + {%- set voted = c.voted_display(v) -%} -{% if standalone and level==1 %} -
- {% if c.post and c.post.over_18 %}+18{% endif %} - - {{c.header_msg(v, is_notification_page) | safe}} - -
-{% endif %} - -{% set isreply = not standalone and c.parent_comment and c.parent_comment.sentto %} - -
- {% if not isreply %} -
-
-
+ {% if standalone and level==1 %} +
+ {% if c.post and c.post.over_18 %}+18{% endif %} + + {{c.header_msg(v, is_notification_page) | safe}} +
{% endif %} - {%- include 'component/comment/user_info.html' -%} -
-
- {%- include 'component/comment/reports.html'-%} - {% if c.state_mod == StateMod.REMOVED and c.state_mod_set_by and v and v.admin_level >= PERMS['POST_COMMENT_MODERATION'] %} -
removed by @{{c.state_mod_set_by}}
+ {% set isreply = not standalone and c.parent_comment and c.parent_comment.sentto %} + +
+ {% if not isreply %} +
+
+
+
+ {% endif %} + {%- include 'component/comment/user_info.html' -%} + +
+
+ {%- include 'component/comment/reports.html'-%} + {% if c.state_mod == StateMod.REMOVED and c.state_mod_set_by and v and v.admin_level >= PERMS['POST_COMMENT_MODERATION'] %} +
removed by @{{c.state_mod_set_by}}
+ {% endif %} + +
+ {{c.realbody(v) | safe}} +
+ {% if c.parent_submission %} + {%- include 'component/comment/editbox_comment.html' -%} +
+
+
+
    + {% if v and v.admin_level >= 2 %} +
  • + +
    • + {% endif %} + {% if v %} + + {% endif %} + +
  • + +
    • + {%- include 'component/comment/voting_mobile.html' -%} +
+
+
+ +
    +
  • + {%- include 'component/comment/voting_desktop.html' -%} + {%- include 'component/comment/actions_desktop.html' -%} +
    • +
+
+ {% endif %} +
+ + {% if v and v.id != c.author_id and c.body %} + {% endif %} -
- {{c.realbody(v) | safe}} -
- {% if c.parent_submission %} - {%- include 'component/comment/editbox_comment.html' -%} -
-
-
-
    - {% if v and v.admin_level >= 2 %} -
  • - -
    • - {% endif %} - {% if v %} - - {% endif %} - -
  • - -
    • - {%- include 'component/comment/voting_mobile.html' -%} -
-
-
+ {%- include 'component/comment/replybox_comment.html' -%} -
    -
  • - {%- include 'component/comment/voting_desktop.html' -%} - {%- include 'component/comment/actions_desktop.html' -%} -
    • -
-
+ {% if is_notification_page and c.is_strict_message and c.author_id not in (NOTIFICATIONS_ID, AUTOJANNY_ID) %} + {%- include 'component/comment/replybox_message.html' -%} + {% endif %} + + {% 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 %} + {% else %} +
{% endif %}
- {% if v and v.id != c.author_id and c.body %} - - {% endif %} + {%- include 'component/comment/actions_mobile.html' -%} - {%- include 'component/comment/replybox_comment.html' -%} - - {% if is_notification_page and c.is_strict_message and c.author_id not in (NOTIFICATIONS_ID, AUTOJANNY_ID) %} - {%- include 'component/comment/replybox_message.html' -%} - {% endif %} - - {% 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 %} - {% else %} -
- {% endif %} + {% if v and v.admin_level >= 2 %} + {%- include 'component/comment/actions_mobile_admin.html' -%} + {% endif %}
- -{%- include 'component/comment/actions_mobile.html' -%} - -{% if v and v.admin_level >= 2 %} - {%- include 'component/comment/actions_mobile_admin.html' -%} -{% endif %} -
{% endif %} {% endmacro %}