fix: show placeholder for deleted user in comments

show "<deleted-account>" in comment headers in case a user
deleted their account.

Signed-off-by: moson <moson@archlinux.org>
This commit is contained in:
moson 2023-07-08 13:23:32 +02:00
parent 1f40f6c5a0
commit 4821fc1312
No known key found for this signature in database
GPG key ID: 4A4760AB4EE15296

View file

@ -1,5 +1,9 @@
{% set header_cls = "comment-header" %} {% set header_cls = "comment-header" %}
{% set article_cls = "article-content" %} {% set article_cls = "article-content" %}
{% set comment_by = comment.User.Username %}
{% if not comment.User %}
{% set comment_by = "&lt;deleted-account&gt;" %}
{% endif %}
{% if comment.Deleter %} {% if comment.Deleter %}
{% set header_cls = "%s %s" | format(header_cls, "comment-deleted") %} {% set header_cls = "%s %s" | format(header_cls, "comment-deleted") %}
{% set article_cls = "%s %s" | format(article_cls, "comment-deleted") %} {% set article_cls = "%s %s" | format(article_cls, "comment-deleted") %}
@ -9,15 +13,15 @@
{% if not (request.user.HideDeletedComments and comment.DelTS) %} {% if not (request.user.HideDeletedComments and comment.DelTS) %}
<h4 id="comment-{{ comment.ID }}" class="{{ header_cls }}"> <h4 id="comment-{{ comment.ID }}" class="{{ header_cls }}">
{% set commented_at = comment.CommentTS | dt | as_timezone(timezone) %} {% set commented_at = comment.CommentTS | dt | as_timezone(timezone) %}
{% set view_account_info = 'View account information for %s' | tr | format(comment.User.Username) %} {% set view_account_info = 'View account information for %s' | tr | format(comment_by) %}
{{ {{
"%s commented on %s" | tr | format( "%s commented on %s" | tr | format(
('<a href="/account/%s" title="%s">%s</a>' | format( ('<a href="/account/%s" title="%s">%s</a>' | format(
comment.User.Username, comment_by,
view_account_info, view_account_info,
comment.User.Username comment_by
)) if request.user.is_authenticated() else )) if request.user.is_authenticated() and comment.User else
(comment.User.Username), (comment_by),
'<a href="#comment-%s" class="date">%s</a>' | format( '<a href="#comment-%s" class="date">%s</a>' | format(
comment.ID, comment.ID,
datetime_display(comment.CommentTS) datetime_display(comment.CommentTS)