From 3c85ad185b6e04fb49aa0462b16e35d7c1fd8000 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Mon, 23 Aug 2021 20:52:56 +0200 Subject: [PATCH] fdfd --- files/classes/comment.py | 8 +++++++- files/templates/comments.html | 18 ++++++++++++------ 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/files/classes/comment.py b/files/classes/comment.py index bd1505926..7c8199042 100644 --- a/files/classes/comment.py +++ b/files/classes/comment.py @@ -111,7 +111,6 @@ class Comment(Base, Age_times, Scores, Stndrd, Fuzzing): if self.parent_comment_id: return f"t3_{self.parent_comment_id}" elif self.parent_submission: return f"t2_{self.parent_submission}" - @property @lazy def replies(self): @@ -131,6 +130,13 @@ class Comment(Base, Age_times, Scores, Stndrd, Fuzzing): def replies2(self, value): self.__dict__["replies2"] = value + @property + @lazy + def replies3(self): + r = self.__dict__.get("replies", None) + if not r and r != []: r = sorted([x for x in self.child_comments], key=lambda x: x.score, reverse=True) + return r + @property @lazy def permalink(self): diff --git a/files/templates/comments.html b/files/templates/comments.html index cc50ce62e..34bb8653d 100644 --- a/files/templates/comments.html +++ b/files/templates/comments.html @@ -11,6 +11,12 @@ {% set score=ups-downs %} {% include "emoji_modal.html" %} +{% if v and v.shadowbanned %} + {% set replies=c.replies3 %} +{% else %} + {% set replies=c.replies %} +{% endif %} + {% if (c.is_banned or c.deleted_utc > 0 or c.is_blocking or c.is_blocked) and not (v and v.admin_level>0) and not (v and v.id==c.author_id) %} @@ -42,14 +48,14 @@ {% if level<6 %}
{% set standalone=False %} - {% for reply in c.replies %} + {% for reply in replies %} {{single_comment(reply, level=level+1)}} {% endfor %}
- {% elif c.replies %} + {% elif replies %}
{% set standalone=False %} - {% for reply in c.replies %} + {% for reply in replies %} {{single_comment(reply, level=level+1)}} {% endfor %}
@@ -382,13 +388,13 @@ {% if render_replies %} {% if level<6 %}
- {% for reply in c.replies %} + {% for reply in replies %} {{single_comment(reply, level=level+1)}} {% endfor %}
- {% elif c.replies %} + {% elif replies %}
- {% for reply in c.replies %} + {% for reply in replies %} {{single_comment(reply, level=level+1)}} {% endfor %}