carpathianflorist
/
MarseyWorld
forked from MarseyWorld/MarseyWorld
1
0
Fork 0
Code Pull Requests Activity

Remove redundant `if not user: abort()` checks.

master
Snakes 2022-09-01 17:44:40 -04:00
parent e11a2d17ba
commit 7e5378405f
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
files/routes/admin.py
View File

@ -151,7 +151,7 @@ def make_admin(v, username):
if SITE == 'rdrama.net': abort(403) if SITE == 'rdrama.net': abort(403)
user = get_user(username) user = get_user(username)
if not user: abort(404)
user.admin_level = 2 user.admin_level = 2
g.db.add(user) g.db.add(user)
@ -169,7 +169,6 @@ def make_admin(v, username):
@admin_level_required(3) @admin_level_required(3)
def remove_admin(v, username): def remove_admin(v, username):
user = get_user(username) user = get_user(username)
if not user: abort(404)
user.admin_level = 0 user.admin_level = 0
g.db.add(user) g.db.add(user)
@ -242,7 +241,6 @@ def distribute(v, option_id):
@admin_level_required(3) @admin_level_required(3)
def revert_actions(v, username): def revert_actions(v, username):
user = get_user(username) user = get_user(username)
if not user: abort(404)
ma = ModAction( ma = ModAction(
kind="revert", kind="revert",
@ -997,11 +995,8 @@ def admin_title_change(user_id, v):
@limiter.limit("1/second;30/minute;200/hour;1000/day") @limiter.limit("1/second;30/minute;200/hour;1000/day")
@admin_level_required(2) @admin_level_required(2)
def ban_user(user_id, v): def ban_user(user_id, v):
user = get_account(user_id) user = get_account(user_id)
if not user: abort(404)
if user.admin_level >= v.admin_level: abort(403) if user.admin_level >= v.admin_level: abort(403)
days = float(request.values.get("days")) if request.values.get('days') else 0 days = float(request.values.get("days")) if request.values.get('days') else 0
@ -1063,10 +1058,9 @@ def ban_user(user_id, v):
@limiter.limit("1/second;30/minute;200/hour;1000/day") @limiter.limit("1/second;30/minute;200/hour;1000/day")
@admin_level_required(2) @admin_level_required(2)
def unban_user(user_id, v): def unban_user(user_id, v):
user = get_account(user_id) user = get_account(user_id)
if not user.is_banned:
if not user or not user.is_banned: abort(400) abort(400)
user.is_banned = 0 user.is_banned = 0
user.unban_utc = 0 user.unban_utc = 0
@ -1098,8 +1092,6 @@ def unban_user(user_id, v):
@admin_level_required(2) @admin_level_required(2)
def mute_user(v, user_id, mute_status): def mute_user(v, user_id, mute_status):
user = get_account(user_id) user = get_account(user_id)
if not user:
abort(400)
if mute_status != 0 and not user.is_muted: if mute_status != 0 and not user.is_muted:
user.is_muted = True user.is_muted = True