From a9a16c83762844b360699f8bafc681ed401feb68 Mon Sep 17 00:00:00 2001 From: Aevann Date: Sat, 16 Sep 2023 02:48:33 +0300 Subject: [PATCH] remove redundant function --- files/helpers/get.py | 22 ---------------------- files/routes/static.py | 2 +- files/routes/subs.py | 2 +- 3 files changed, 2 insertions(+), 24 deletions(-) diff --git a/files/helpers/get.py b/files/helpers/get.py index b2df1f5a7..cb55cb16f 100644 --- a/files/helpers/get.py +++ b/files/helpers/get.py @@ -11,28 +11,6 @@ def sanitize_username(username): if not username: return username return username.replace('\\', '').replace('_', '\_').replace('%', '').replace('(', '').replace(')', '').strip() -def get_id(username, graceful=False): - username = sanitize_username(username) - if not username: - if graceful: return None - abort(400, "Empty username.") - - user = g.db.query( - User.id - ).filter( - or_( - User.username.ilike(username), - User.original_username.ilike(username), - User.prelock_username.ilike(username), - ) - ).one_or_none() - - if not user: - if graceful: return None - abort(404, "User not found.") - - return user[0] - def get_user(username, v=None, graceful=False, include_blocks=False, attributes=None): if not username: if graceful: return None diff --git a/files/routes/static.py b/files/routes/static.py index 317521d70..c07a5006f 100644 --- a/files/routes/static.py +++ b/files/routes/static.py @@ -170,7 +170,7 @@ def log(v): page = get_page() admin = request.values.get("admin") - if admin: admin_id = get_id(admin) + if admin: admin_id = get_user(admin, attributes=[User.id]).id else: admin_id = 0 kind = request.values.get("kind") diff --git a/files/routes/subs.py b/files/routes/subs.py index d4e5654c3..dfc80cac1 100644 --- a/files/routes/subs.py +++ b/files/routes/subs.py @@ -854,7 +854,7 @@ def hole_log(v, sub): page = get_page() mod = request.values.get("mod") - if mod: mod_id = get_id(mod) + if mod: mod_id = get_user(mod, attributes=[User.id]).id else: mod_id = 0 kind = request.values.get("kind")