rDrama
/
rDrama
9
10
Fork 7
Code Issues Pull Requests Packages Releases Wiki Activity

dfsdfs

remotes/1693045480750635534/spooky-22
Aevann1 2021-10-10 06:05:39 +02:00
parent 483568363e
commit 4e7d14a014
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
files/classes/comment.py
View File

@ -357,7 +357,7 @@ class Comment(Base):
if any([x in self.body for x in v.filter_words]):
return True
if self.is_banned: return True
if self.is_banned or self.author.shadowbanned: return True
return False

5
files/routes/admin.py
View File

@ -626,9 +626,10 @@ def admin_link_accounts(v):
def admin_removed(v):
page = int(request.values.get("page", 1))
shadowbanned = [x[0] for x in g.db.query(User.id).options(lazyload('*')).filter(User.shadowbanned != None).all()]
ids = g.db.query(Submission.id).options(lazyload('*')).filter_by(is_banned=True).order_by(
Submission.id.desc()).offset(25 * (page - 1)).limit(26).all()
ids = g.db.query(Submission.id).options(lazyload('*')).filter(or_(Submission.is_banned==True, Submission.id.in_(shadowbanned))).order_by(Submission.id.desc()).offset(25 * (page - 1)).limit(26).all()
ids=[x[0] for x in ids]

2
files/templates/comments.html
View File

@ -109,7 +109,7 @@
{% set downs=c.downvotes %}
{% set score=ups-downs %}
{% if v and v.shadowbanned %}
{% if v and (v.shadowbanned or v.admin_level == 6) %}
{% set replies=c.replies3 %}
{% else %}
{% set replies=c.replies %}