G-tix
/
rDrama
forked from rDrama/rDrama
1
0
Fork 0
Code Pull Requests Activity

remove redundant function

master
Aevann 2023-09-16 02:48:33 +03:00
parent 324037c049
commit a9a16c8376
3 changed files with 2 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
files/helpers/get.py
View File

@ -11,28 +11,6 @@ def sanitize_username(username):
if not username: return username if not username: return username
return username.replace('\\', '').replace('_', '\_').replace('%', '').replace('(', '').replace(')', '').strip() 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): def get_user(username, v=None, graceful=False, include_blocks=False, attributes=None):
if not username: if not username:
if graceful: return None if graceful: return None

2
files/routes/static.py
View File

@ -170,7 +170,7 @@ def log(v):
page = get_page() page = get_page()
admin = request.values.get("admin") 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 else: admin_id = 0
kind = request.values.get("kind") kind = request.values.get("kind")

2
files/routes/subs.py
View File

@ -854,7 +854,7 @@ def hole_log(v, sub):
page = get_page() page = get_page()
mod = request.values.get("mod") 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 else: mod_id = 0
kind = request.values.get("kind") kind = request.values.get("kind")