forked from rDrama/rDrama
remove unnecessary graceful=True from get_user() usages
parent
eb17c10c23
commit
7cd1fbd08f
|
@ -60,7 +60,7 @@ def get_user(username, v=None, graceful=False, include_blocks=False, id_only=Fal
|
||||||
|
|
||||||
if not user:
|
if not user:
|
||||||
if graceful: return None
|
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:
|
if v and include_blocks:
|
||||||
user = add_block_props(user, v)
|
user = add_block_props(user, v)
|
||||||
|
|
|
@ -461,9 +461,7 @@ def badge_grant_post(v):
|
||||||
abort(400, "You must enter usernames!")
|
abort(400, "You must enter usernames!")
|
||||||
|
|
||||||
for username in usernames.split():
|
for username in usernames.split():
|
||||||
user = get_user(username, graceful=True)
|
user = get_user(username)
|
||||||
if not user:
|
|
||||||
abort(400, "User not found!")
|
|
||||||
|
|
||||||
try: badge_id = int(request.values.get("badge_id"))
|
try: badge_id = int(request.values.get("badge_id"))
|
||||||
except: abort(400)
|
except: abort(400)
|
||||||
|
@ -531,9 +529,7 @@ def badge_remove_post(v):
|
||||||
abort(400, "You must enter usernames!")
|
abort(400, "You must enter usernames!")
|
||||||
|
|
||||||
for username in usernames.split():
|
for username in usernames.split():
|
||||||
user = get_user(username, graceful=True)
|
user = get_user(username)
|
||||||
if not user:
|
|
||||||
abort(400, "User not found!")
|
|
||||||
|
|
||||||
try: badge_id = int(request.values.get("badge_id"))
|
try: badge_id = int(request.values.get("badge_id"))
|
||||||
except: abort(400)
|
except: abort(400)
|
||||||
|
|
|
@ -81,9 +81,7 @@ def submit_emoji(v):
|
||||||
if not tags_regex.fullmatch(tags):
|
if not tags_regex.fullmatch(tags):
|
||||||
abort(400, "Invalid tags!")
|
abort(400, "Invalid tags!")
|
||||||
|
|
||||||
author = get_user(username, v=v, graceful=True)
|
author = get_user(username, v=v)
|
||||||
if not author:
|
|
||||||
abort(400, f"A user with the name '{username}' was not found!")
|
|
||||||
|
|
||||||
highquality = f'/asset_submissions/emojis/{name}'
|
highquality = f'/asset_submissions/emojis/{name}'
|
||||||
file.save(highquality)
|
file.save(highquality)
|
||||||
|
@ -296,9 +294,7 @@ def submit_hat(v):
|
||||||
if not description_regex.fullmatch(description):
|
if not description_regex.fullmatch(description):
|
||||||
abort(400, "Invalid description!")
|
abort(400, "Invalid description!")
|
||||||
|
|
||||||
author = get_user(username, v=v, graceful=True)
|
author = get_user(username, v=v)
|
||||||
if not author:
|
|
||||||
abort(400, f"A user with the name '{username}' was not found!")
|
|
||||||
|
|
||||||
highquality = f'/asset_submissions/hats/{name}'
|
highquality = f'/asset_submissions/hats/{name}'
|
||||||
file.save(highquality)
|
file.save(highquality)
|
||||||
|
|
|
@ -663,8 +663,7 @@ def settings_blocks(v):
|
||||||
@limiter.limit("20/day", deduct_when=lambda response: response.status_code < 400, key_func=get_ID)
|
@limiter.limit("20/day", deduct_when=lambda response: response.status_code < 400, key_func=get_ID)
|
||||||
@auth_required
|
@auth_required
|
||||||
def settings_block_user(v):
|
def settings_block_user(v):
|
||||||
user = get_user(request.values.get("username"), graceful=True)
|
user = get_user(request.values.get("username"))
|
||||||
if not user: abort(404, "This user doesn't exist!")
|
|
||||||
|
|
||||||
if user.unblockable:
|
if user.unblockable:
|
||||||
if not v.shadowbanned:
|
if not v.shadowbanned:
|
||||||
|
|
Loading…
Reference in New Issue