ticket #90 attempt 1

Browse Source
This commit is contained in:
Typosaurus 2026-07-19 21:06:49 +00:00
parent 43c5a948e8
commit b65360be40
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
devplacepy/templates/_comment.html
View File

@ -1,4 +1,4 @@
{% macro comment_cell(item, depth, parent_author=None) %} {% macro comment_cell(item, depth, parent_author=None, parent_url=None) %}
<div class="comment" style="--comment-depth: {{ depth }};" data-depth="{{ depth }}"> <div class="comment" style="--comment-depth: {{ depth }};" data-depth="{{ depth }}">
<div class="comment-votes" role="group" aria-label="Comment votes"> <div class="comment-votes" role="group" aria-label="Comment votes">
<form method="POST" action="/votes/comment/{{ item.comment['uid'] }}"> <form method="POST" action="/votes/comment/{{ item.comment['uid'] }}">
@ -26,6 +26,7 @@
{% endif %} {% endif %}
<div class="comment-actions"> <div class="comment-actions">
<button type="button" class="comment-action-btn" data-action="reply"{{ guest_disabled(user) }}><span class="icon">💬</span><span class="label"> Reply</span></button> <button type="button" class="comment-action-btn" data-action="reply"{{ guest_disabled(user) }}><span class="icon">💬</span><span class="label"> Reply</span></button>
<button type="button" class="comment-action-btn" data-share="{{ parent_url }}#comment-{{ item.comment['uid'] }}"><span class="icon">&#x1F517;</span><span class="label"> Share</span></button>
{% if owns(item.comment, user) %} {% if owns(item.comment, user) %}
<button type="button" class="comment-action-btn" data-action="edit" data-edit-url="/comments/edit/{{ item.comment['uid'] }}"><span class="icon">✏️</span><span class="label"> Edit</span></button> <button type="button" class="comment-action-btn" data-action="edit" data-edit-url="/comments/edit/{{ item.comment['uid'] }}"><span class="icon">✏️</span><span class="label"> Edit</span></button>
<form method="POST" action="/comments/delete/{{ item.comment['uid'] }}" class="inline-form comment-delete-form" data-comment-uid="{{ item.comment['uid'] }}"> <form method="POST" action="/comments/delete/{{ item.comment['uid'] }}" class="inline-form comment-delete-form" data-comment-uid="{{ item.comment['uid'] }}">
@ -39,21 +40,21 @@
</div> </div>
{% endmacro %} {% endmacro %}
{% macro render_comment(item, depth=0) %} {% macro render_comment(item, depth=0, parent_url=None) %}
{% set max_depth = 2 %} {% set max_depth = 2 %}
{% set visual_depth = depth if depth < max_depth else max_depth %} {% set visual_depth = depth if depth < max_depth else max_depth %}
{% call comment_cell(item, visual_depth) %} {% call comment_cell(item, visual_depth, parent_url=parent_url) %}
{% if item.children %} {% if item.children %}
{% if depth < max_depth %} {% if depth < max_depth %}
<div class="comment-replies"> <div class="comment-replies">
{% for child in item.children %} {% for child in item.children %}
{{ render_comment(child, depth + 1) }} {{ render_comment(child, depth + 1, parent_url) }}
{% endfor %} {% endfor %}
</div> </div>
{% else %} {% else %}
<div class="comment-replies comment-replies-flat"> <div class="comment-replies comment-replies-flat">
{% for child in item.children %} {% for child in item.children %}
{{ render_comment_flat(child, max_depth, item.author) }} {{ render_comment_flat(child, max_depth, item.author, parent_url) }}
{% endfor %} {% endfor %}
</div> </div>
{% endif %} {% endif %}
@ -61,9 +62,9 @@
{% endcall %} {% endcall %}
{% endmacro %} {% endmacro %}
{% macro render_comment_flat(item, depth, parent_author) %} {% macro render_comment_flat(item, depth, parent_author, parent_url=None) %}
{% call comment_cell(item, depth, parent_author) %}{% endcall %} {% call comment_cell(item, depth, parent_author, parent_url=parent_url) %}{% endcall %}
{% for child in item.children %} {% for child in item.children %}
{{ render_comment_flat(child, depth, item.author) }} {{ render_comment_flat(child, depth, item.author, parent_url) }}
{% endfor %} {% endfor %}
{% endmacro %} {% endmacro %}

4
devplacepy/templates/_comment_section.html
View File

@ -3,8 +3,10 @@
{% from "_comment.html" import render_comment with context %} {% from "_comment.html" import render_comment with context %}
{% set parent_url = resolve_object_url(target_type, target_uid) %}
{% for item in comments %} {% for item in comments %}
{{ render_comment(item, 0) }} {{ render_comment(item, 0, parent_url) }}
{% else %} {% else %}
<p class="no-comments-msg">No comments yet. Start the discussion.</p> <p class="no-comments-msg">No comments yet. Start the discussion.</p>
{% endfor %} {% endfor %}

2
devplacepy/templating.py
View File

@ -9,6 +9,7 @@ from devplacepy.cache import TTLCache
from devplacepy.config import STATIC_VERSION, TEMPLATES_DIR, TEMPLATE_AUTO_RELOAD, PRESENCE_TIMEOUT_SECONDS from devplacepy.config import STATIC_VERSION, TEMPLATES_DIR, TEMPLATE_AUTO_RELOAD, PRESENCE_TIMEOUT_SECONDS
from devplacepy.constants import TOPICS, REACTION_EMOJI from devplacepy.constants import TOPICS, REACTION_EMOJI
from devplacepy.database import get_int_setting, get_setting, get_table from devplacepy.database import get_int_setting, get_setting, get_table
from devplacepy.database.content import resolve_object_url
from devplacepy.avatar import avatar_url, avatar_seed from devplacepy.avatar import avatar_url, avatar_seed
from devplacepy.utils import format_date as _format_date from devplacepy.utils import format_date as _format_date
from devplacepy.utils import time_ago as _time_ago from devplacepy.utils import time_ago as _time_ago
@ -49,6 +50,7 @@ templates.env.globals["is_self"] = is_self
templates.env.globals["guest_disabled"] = guest_disabled templates.env.globals["guest_disabled"] = guest_disabled
templates.env.globals["is_online"] = presence.is_online templates.env.globals["is_online"] = presence.is_online
templates.env.globals["presence_timeout"] = PRESENCE_TIMEOUT_SECONDS templates.env.globals["presence_timeout"] = PRESENCE_TIMEOUT_SECONDS
templates.env.globals["resolve_object_url"] = resolve_object_url
from devplacepy.docs_devrant import devrant_endpoints from devplacepy.docs_devrant import devrant_endpoints