rDrama
/
rDrama
9
10
Fork 8
Code Issues Pull Requests Packages Releases Wiki Activity

remove unnecessary graceful=True from get_user() usages

pull/200/head
Aevann 2023-09-06 21:13:32 +03:00
parent eb17c10c23
commit 7cd1fbd08f
4 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
files/helpers/get.py
View File

@ -60,7 +60,7 @@ def get_user(username, v=None, graceful=False, include_blocks=False, id_only=Fal
if not user:
if graceful: return None
abort(404, "User not found.")
abort(404, f"A user with the name '{username}' was not found!")
if v and include_blocks:
user = add_block_props(user, v)

8
files/routes/admin.py
View File

@ -461,9 +461,7 @@ def badge_grant_post(v):
abort(400, "You must enter usernames!")
for username in usernames.split():
user = get_user(username, graceful=True)
if not user:
abort(400, "User not found!")
user = get_user(username)
try: badge_id = int(request.values.get("badge_id"))
except: abort(400)
@ -531,9 +529,7 @@ def badge_remove_post(v):
abort(400, "You must enter usernames!")
for username in usernames.split():
user = get_user(username, graceful=True)
if not user:
abort(400, "User not found!")
user = get_user(username)
try: badge_id = int(request.values.get("badge_id"))
except: abort(400)

8
files/routes/asset_submissions.py
View File

@ -81,9 +81,7 @@ def submit_emoji(v):
if not tags_regex.fullmatch(tags):
abort(400, "Invalid tags!")
author = get_user(username, v=v, graceful=True)
if not author:
abort(400, f"A user with the name '{username}' was not found!")
author = get_user(username, v=v)
highquality = f'/asset_submissions/emojis/{name}'
file.save(highquality)
@ -296,9 +294,7 @@ def submit_hat(v):
if not description_regex.fullmatch(description):
abort(400, "Invalid description!")
author = get_user(username, v=v, graceful=True)
if not author:
abort(400, f"A user with the name '{username}' was not found!")
author = get_user(username, v=v)
highquality = f'/asset_submissions/hats/{name}'
file.save(highquality)

3
files/routes/settings.py
View File

@ -663,8 +663,7 @@ def settings_blocks(v):
@limiter.limit("20/day", deduct_when=lambda response: response.status_code < 400, key_func=get_ID)
@auth_required
def settings_block_user(v):
user = get_user(request.values.get("username"), graceful=True)
if not user: abort(404, "This user doesn't exist!")
user = get_user(request.values.get("username"))
if user.unblockable:
if not v.shadowbanned: