From cfe90af57d1d57cfe60032bc77e4c0648737fe10 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Sat, 7 Aug 2021 17:40:42 +0200 Subject: [PATCH] dg --- files/classes/comment.py | 5 +---- files/templates/comments.html | 12 ++++++------ 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/files/classes/comment.py b/files/classes/comment.py index 28d87f091..788a29c52 100644 --- a/files/classes/comment.py +++ b/files/classes/comment.py @@ -92,9 +92,6 @@ class Comment(Base, Age_times, Scores, Stndrd, Fuzzing): def score_disputed(self): return (self.upvotes+1) * (self.downvotes+1) - def children(self, v): - return sorted([x for x in self.child_comments if not x.author.shadowbanned or (v and v.id == x.author_id)], key=lambda x: x.score, reverse=True) - @property @lazy def parent(self): @@ -116,7 +113,7 @@ class Comment(Base, Age_times, Scores, Stndrd, Fuzzing): def replies(self): r = self.__dict__.get("replies", None) - if not r: r = self.child_comments + if not r: r = sorted([x for x in self.child_comments], key=lambda x: x.score, reverse=True) return r @replies.setter diff --git a/files/templates/comments.html b/files/templates/comments.html index 10cc75c70..4aaeb695f 100644 --- a/files/templates/comments.html +++ b/files/templates/comments.html @@ -44,14 +44,14 @@ {% if level<6 %}
{% set standalone=False %} - {% for reply in c.children(v) %} + {% for reply in c.replies %} {{single_comment(reply, level=level+1)}} {% endfor %}
- {% elif c.children(v) %} + {% elif c.replies %}
{% set standalone=False %} - {% for reply in c.children(v) %} + {% for reply in c.replies %} {{single_comment(reply, level=level+1)}} {% endfor %}
@@ -376,13 +376,13 @@ {% if render_replies %} {% if level<6 %}
- {% for reply in c.children(v) %} + {% for reply in c.replies %} {{single_comment(reply, level=level+1)}} {% endfor %}
- {% elif c.children(v) %} + {% elif c.replies %}
- {% for reply in c.children(v) %} + {% for reply in c.replies %} {{single_comment(reply, level=level+1)}} {% endfor %}