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

redundant

Browse source
This commit is contained in:
Aevann1 2021-11-06 17:52:48 +02:00
parent b98514cc1a
commit 90a6e7c53b
24 changed files with 284 additions and 289 deletions
Download patch file Download diff file Expand all files Collapse all files

10
files/routes/search.py
View file

@ -57,7 +57,7 @@ def searchposts(v):
posts = g.db.query(Submission.id).options(lazyload('*'))
posts = g.db.query(Submission.id)
if not (v and v.admin_level == 6): posts = posts.filter(Submission.private == False)
@ -100,10 +100,10 @@ def searchposts(v):
pass
elif v:
blocking = [x[0] for x in g.db.query(
UserBlock.target_id).options(lazyload('*')).filter_by(
UserBlock.target_id).filter_by(
user_id=v.id).all()]
blocked = [x[0] for x in g.db.query(
UserBlock.user_id).options(lazyload('*')).filter_by(
UserBlock.user_id).filter_by(
target_id=v.id).all()]
posts = posts.filter(
@ -195,7 +195,7 @@ def searchcomments(v):
comments = g.db.query(Comment.id).options(lazyload('*')).filter(Comment.parent_submission != None)
comments = g.db.query(Comment.id).filter(Comment.parent_submission != None)
if 'q' in criteria:
words=criteria['q'].split()
@ -272,7 +272,7 @@ def searchusers(v):
term=term.replace('\\','')
term=term.replace('_','\_')
users=g.db.query(User).options(lazyload('*')).filter(User.username.ilike(f'%{term}%'))
users=g.db.query(User).filter(User.username.ilike(f'%{term}%'))
users=users.order_by(User.username.ilike(term).desc(), User.stored_subscriber_count.desc())