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

Merge branch 'master' of https://github.com/Aevann1/Drama

Browse source
This commit is contained in:
Aevann1 2021-11-02 13:33:41 -07:00
commit ce3be3bcb2
15 changed files with 41 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

6
files/routes/posts.py
View file

@ -171,7 +171,7 @@ def post_id(pid, anything=None, v=None):
post.replies = [x for x in output if x.is_pinned] + [x for x in output if x.level == 1 and not x.is_pinned]
else:
shadowbanned = [x[0] for x in g.db.query(User.id).options(lazyload('*')).filter(User.shadowbanned != None).all()]
comments = g.db.query(Comment).filter(Comment.parent_submission == post.id, Comment.author_id != AUTOPOLLER_ACCOUNT, Comment.author_id.notin_(shadowbanned))
comments = g.db.query(Comment).options(lazyload('*')).filter(Comment.parent_submission == post.id, Comment.author_id != AUTOPOLLER_ACCOUNT, Comment.author_id.notin_(shadowbanned))
if sort == "new":
comments = comments.order_by(Comment.created_utc.desc())
@ -386,11 +386,11 @@ def thumbnail_thread(pid):
db = db_session()
post = db.query(Submission).filter_by(id=pid).first()
post = db.query(Submission).options(lazyload('*')).filter_by(id=pid).first()
if not post:
time.sleep(5)
post = db.query(Submission).filter_by(id=pid).first()
post = db.query(Submission).options(lazyload('*')).filter_by(id=pid).first()
fetch_url=post.url