skorotkiewicz/rDrama
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fdfd

Browse source
This commit is contained in:
Aevann1 2021-08-23 20:52:56 +02:00
parent f8e788b49d
commit 48faa851df
2 changed files with 19 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
files/classes/comment.py
View file

@ -111,7 +111,6 @@ class Comment(Base, Age_times, Scores, Stndrd, Fuzzing):
if self.parent_comment_id: return f"t3_{self.parent_comment_id}" if self.parent_comment_id: return f"t3_{self.parent_comment_id}"
elif self.parent_submission: return f"t2_{self.parent_submission}" elif self.parent_submission: return f"t2_{self.parent_submission}"
@property @property
@lazy @lazy
def replies(self): def replies(self):
@ -131,6 +130,13 @@ class Comment(Base, Age_times, Scores, Stndrd, Fuzzing):
def replies2(self, value): def replies2(self, value):
self.__dict__["replies2"] = 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 @property
@lazy @lazy
def permalink(self): def permalink(self):

18
files/templates/comments.html
View file

@ -11,6 +11,12 @@
{% set score=ups-downs %} {% set score=ups-downs %}
{% include "emoji_modal.html" %} {% include "emoji_modal.html" %}
{% if v and v.shadowbanned %}
{% set replies=c.replies3 %}
{% else %}
{% set replies=c.replies %}
{% endif %}
<!--conditions under which a comment might be hidden--> <!--conditions under which a comment might be hidden-->
{% 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) %} {% 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 %} {% if level<6 %}
<div id="replies-of-{{c.id}}" class=""> <div id="replies-of-{{c.id}}" class="">
{% set standalone=False %} {% set standalone=False %}
{% for reply in c.replies %} {% for reply in replies %}
{{single_comment(reply, level=level+1)}} {{single_comment(reply, level=level+1)}}
{% endfor %} {% endfor %}
</div> </div>
{% elif c.replies %} {% elif replies %}
<div id="replies-of-{{c.id}}" class="d-none d-md-block"> <div id="replies-of-{{c.id}}" class="d-none d-md-block">
{% set standalone=False %} {% set standalone=False %}
{% for reply in c.replies %} {% for reply in replies %}
{{single_comment(reply, level=level+1)}} {{single_comment(reply, level=level+1)}}
{% endfor %} {% endfor %}
</div> </div>
@ -382,13 +388,13 @@
{% if render_replies %} {% if render_replies %}
{% if level<6 %} {% if level<6 %}
<div id="replies-of-{{c.id}}"> <div id="replies-of-{{c.id}}">
{% for reply in c.replies %} {% for reply in replies %}
{{single_comment(reply, level=level+1)}} {{single_comment(reply, level=level+1)}}
{% endfor %} {% endfor %}
</div> </div>
{% elif c.replies %} {% elif replies %}
<div id="replies-of-{{c.id}}" class="d-none d-md-block"> <div id="replies-of-{{c.id}}" class="d-none d-md-block">
{% for reply in c.replies %} {% for reply in replies %}
{{single_comment(reply, level=level+1)}} {{single_comment(reply, level=level+1)}}
{% endfor %} {% endfor %}
</div> </div>