carpathianflorist
/
MarseyWorld
forked from MarseyWorld/MarseyWorld
1
0
Fork 0
Code Pull Requests Activity

dfssdf'

master
Aevann1 2021-11-16 05:55:29 +02:00
parent 8289d8c2df
commit 4e3950e257
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
files/routes/search.py
View File

@ -91,10 +91,7 @@ def searchposts(v):
) )
if not(v and v.admin_level > 1): if not(v and v.admin_level > 1):
posts = posts.filter( posts = posts.join(User, User.id==Submission.author_id).filter(User.is_private == False, Submission.deleted_utc == 0, Submission.is_banned == False)
Submission.deleted_utc == 0,
Submission.is_banned == False,
)
if v and v.admin_level > 1: if v and v.admin_level > 1:
pass pass
@ -193,8 +190,6 @@ def searchcomments(v):
comments = g.db.query(Comment.id).filter(Comment.parent_submission != None) comments = g.db.query(Comment.id).filter(Comment.parent_submission != None)
if 'q' in criteria: if 'q' in criteria:
@ -208,9 +203,7 @@ def searchcomments(v):
if 'author' in criteria: comments = comments.filter(Comment.author_id == get_user(criteria['author']).id) if 'author' in criteria: comments = comments.filter(Comment.author_id == get_user(criteria['author']).id)
if not(v and v.admin_level > 1): if not(v and v.admin_level > 1):
comments = comments.filter( comments = comments.join(User, User.id==Comment.author_id).filter(User.is_private == False, Comment.deleted_utc == 0, Comment.is_banned == False)
Comment.deleted_utc == 0,
Comment.is_banned == False)
if t: if t:
now = int(time.time()) now = int(time.time())