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

Fix some deprecations and factor out a helper function (#387)

Browse source
This commit is contained in:
FatherInire 2022-10-28 14:15:48 +11:00 • committed by GitHub
parent 4bdfe28a35
commit b46ada9f72
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 59 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

10
files/helpers/get.py
View file

@ -1,10 +1,11 @@
from files.classes import *
from files.helpers.strings import sql_ilike_clean
from flask import g
def get_id(username, v=None, graceful=False):
username = username.replace('\\', '').replace('_', '\_').replace('%', '').strip()
username = sql_ilike_clean(username)
user = g.db.query(
User.id
@ -30,7 +31,7 @@ def get_user(username, v=None, graceful=False):
if not graceful: abort(404)
else: return None
username = username.replace('\\', '').replace('_', '\_').replace('%', '').strip()
username = sql_ilike_clean(username)
user = g.db.query(
User
@ -68,10 +69,7 @@ def get_users(usernames, v=None, graceful=False):
if not graceful: abort(404)
else: return []
def clean(n):
return n.replace('\\', '').replace('_', '\_').replace('%', '').strip()
usernames = [ clean(n) for n in usernames ]
usernames = [ sql_ilike_clean(n) for n in usernames ]
users = g.db.query(User).filter(
or_(