From 9a867c6611e9f51c91764647922f4e6dba2e46bd Mon Sep 17 00:00:00 2001 From: Aevann Date: Tue, 5 Mar 2024 21:07:13 +0200 Subject: [PATCH] fix 500 error --- files/routes/art_submissions.py | 7 ++++--- files/routes/asset_submissions.py | 11 ++++++----- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/files/routes/art_submissions.py b/files/routes/art_submissions.py index 551ef38f3..899755fb8 100644 --- a/files/routes/art_submissions.py +++ b/files/routes/art_submissions.py @@ -91,6 +91,8 @@ def submit_art_post(v): @limiter.limit(DEFAULT_RATELIMIT, deduct_when=lambda response: response.status_code < 400, key_func=get_ID) @admin_level_required(PERMS['MODERATE_PENDING_SUBMITTED_ASSETS']) def approve_art(v, id): + comment = request.values.get("comment", "").strip() + entry = g.db.get(ArtSubmission, id) if not entry: abort(404, "Art submission not found!") @@ -113,7 +115,6 @@ def approve_art(v, id): if v.id != author.id: msg = f"@{v.username} (a site admin) has approved a {entry.formatted_kind} you made:\n{entry_url}" - comment = request.values.get("comment") if comment: msg += f"\nComment: `{comment}`" @@ -122,7 +123,6 @@ def approve_art(v, id): if v.id != entry.submitter_id and author.id != entry.submitter_id: msg = f"@{v.username} (a site admin) has approved a {entry.formatted_kind} you submitted:\n{entry_url}" - comment = request.values.get("comment") if comment: msg += f"\nComment: `{comment}`" @@ -152,6 +152,8 @@ def approve_art(v, id): @limiter.limit(DEFAULT_RATELIMIT, deduct_when=lambda response: response.status_code < 400, key_func=get_ID) @auth_required def remove_art(v, id): + comment = request.values.get("comment", "").strip() + entry = g.db.get(ArtSubmission, id) if not entry: abort(404, "Art submission not found!") @@ -163,7 +165,6 @@ def remove_art(v, id): entry_url = f'{SITE_FULL_IMAGES}/asset_submissions/art/{entry.id}.webp' msg = f"@{v.username} (a site admin) has rejected a {entry.formatted_kind} you submitted:\n{entry_url}" - comment = request.values.get("comment") if comment: msg += f"\nComment: `{comment}`" diff --git a/files/routes/asset_submissions.py b/files/routes/asset_submissions.py index 150bc624c..9b1a6ecd3 100644 --- a/files/routes/asset_submissions.py +++ b/files/routes/asset_submissions.py @@ -147,6 +147,8 @@ def verify_permissions_and_get_asset(cls, asset_type, v, name, make_lower=False) @limiter.limit(DEFAULT_RATELIMIT, deduct_when=lambda response: response.status_code < 400, key_func=get_ID) @admin_level_required(PERMS['MODERATE_PENDING_SUBMITTED_ASSETS']) def approve_emoji(v, name): + comment = request.values.get("comment", "").strip() + emoji = verify_permissions_and_get_asset(Emoji, "emoji", v, name, True) tags = request.values.get('tags').lower().strip().replace(' ', ' ') if not tags: @@ -231,7 +233,6 @@ def approve_emoji(v, name): if v.id != author.id: msg = f"@{v.username} (a site admin) has approved an emoji you made: :{emoji.name}:\n\nYou have received {amount} coins as a reward!" - comment = request.values.get("comment") if comment: msg += f"\nComment: `{comment}`" @@ -240,7 +241,6 @@ def approve_emoji(v, name): if v.id != emoji.submitter_id and author.id != emoji.submitter_id: msg = f"@{v.username} (a site admin) has approved an emoji you submitted: :{emoji.name}:" - comment = request.values.get("comment") if comment: msg += f"\nComment: `{comment}`" @@ -280,6 +280,8 @@ def approve_emoji(v, name): return {"message": f"'{emoji.name}' approved!"} def remove_asset(cls, type_name, v, name): + comment = request.values.get("comment", "").strip() + if cls not in ASSET_TYPES: raise Exception("not a valid asset type") should_make_lower = cls == Emoji if should_make_lower: name = name.lower() @@ -300,7 +302,6 @@ def remove_asset(cls, type_name, v, name): if v.id != asset.submitter_id: msg = f"@{v.username} (a site admin) has rejected a {type_name} you submitted: `'{name}'`" - comment = request.values.get("comment") if comment: msg += f"\nComment: `{comment}`" @@ -407,6 +408,8 @@ def submit_hat(v): @limiter.limit("120/minute;200/hour;1000/day", deduct_when=lambda response: response.status_code < 400, key_func=get_ID) @admin_level_required(PERMS['MODERATE_PENDING_SUBMITTED_ASSETS']) def approve_hat(v, name): + comment = request.values.get("comment", "").strip() + hat = verify_permissions_and_get_asset(HatDef, "hat", v, name, False) description = request.values.get('description').strip() if not description: abort(400, "You need to include a description!") @@ -451,7 +454,6 @@ def approve_hat(v, name): if v.id != author.id: msg = f"@{v.username} (a site admin) has approved a hat you made: `'{hat.name}'`" - comment = request.values.get("comment") if comment: msg += f"\nComment: `{comment}`" @@ -460,7 +462,6 @@ def approve_hat(v, name): if v.id != hat.submitter_id and author.id != hat.submitter_id: msg = f"@{v.username} (a site admin) has approved a hat you submitted: `'{hat.name}'`" - comment = request.values.get("comment") if comment: msg += f"\nComment: `{comment}`"