diff --git a/files/routes/errors.py b/files/routes/errors.py index be193f3c7..2e468a30f 100644 --- a/files/routes/errors.py +++ b/files/routes/errors.py @@ -40,6 +40,10 @@ def error_405(e): else: return render_template('errors/405.html', err=True), 405 +@app.errorhandler(413) +def error_413(e): + return {"error": "Max file size is 4 MB (8 MB for paypigs)"}, 413 + @app.errorhandler(429) def error_429(e): if request.headers.get("Authorization"): return {"error": "429 Too Many Requests"}, 429 diff --git a/files/routes/posts.py b/files/routes/posts.py index 8371f691f..bc0c35de1 100644 --- a/files/routes/posts.py +++ b/files/routes/posts.py @@ -388,8 +388,8 @@ def morecomments(v, cid): @auth_required def edit_post(pid, v): if v and v.patron: - if request.content_length > 8 * 1024 * 1024: return {"error":"Max file size is 8 MB."} - elif request.content_length > 4 * 1024 * 1024: return {"error":"Max file size is 4 MB."} + if request.content_length > 8 * 1024 * 1024: return {"error":"Max file size is 8 MB."}, 413 + elif request.content_length > 4 * 1024 * 1024: return {"error":"Max file size is 4 MB."}, 413 p = get_post(pid) @@ -687,8 +687,8 @@ def submit_post(v): if v.is_suspended: return {"error": "You can't perform this action while banned."}, 403 if v and v.patron: - if request.content_length > 8 * 1024 * 1024: return {"error": "Max file size is 8 MB."} - elif request.content_length > 4 * 1024 * 1024: return {"error": "Max file size is 4 MB."} + if request.content_length > 8 * 1024 * 1024: return {"error": "Max file size is 8 MB."}, 413 + elif request.content_length > 4 * 1024 * 1024: return {"error": "Max file size is 4 MB."}, 413 title = request.values.get("title", "").strip()[:500].replace('‎','') diff --git a/files/routes/settings.py b/files/routes/settings.py index 186c05070..783dbfa00 100644 --- a/files/routes/settings.py +++ b/files/routes/settings.py @@ -47,8 +47,8 @@ def removebackground(v): @auth_required def settings_profile_post(v): if v and v.patron: - if request.content_length > 8 * 1024 * 1024: return {"error":"Max file size is 8 MB."} - elif request.content_length > 4 * 1024 * 1024: return {"error":"Max file size is 4 MB."} + if request.content_length > 8 * 1024 * 1024: return {"error":"Max file size is 8 MB."}, 413 + elif request.content_length > 4 * 1024 * 1024: return {"error":"Max file size is 4 MB."}, 413 updated = False @@ -620,8 +620,8 @@ def settings_log_out_others(v): @auth_required def settings_images_profile(v): if v and v.patron: - if request.content_length > 8 * 1024 * 1024: return {"error":"Max file size is 8 MB."} - elif request.content_length > 4 * 1024 * 1024: return {"error":"Max file size is 4 MB."} + if request.content_length > 8 * 1024 * 1024: return {"error":"Max file size is 8 MB."}, 413 + elif request.content_length > 4 * 1024 * 1024: return {"error":"Max file size is 4 MB."}, 413 if request.headers.get("cf-ipcountry") == "T1": return {"error":"Image uploads are not allowed through TOR."}, 403 @@ -655,8 +655,8 @@ def settings_images_profile(v): @auth_required def settings_images_banner(v): if v and v.patron: - if request.content_length > 8 * 1024 * 1024: return {"error":"Max file size is 8 MB."} - elif request.content_length > 4 * 1024 * 1024: return {"error":"Max file size is 4 MB."} + if request.content_length > 8 * 1024 * 1024: return {"error":"Max file size is 8 MB."}, 413 + elif request.content_length > 4 * 1024 * 1024: return {"error":"Max file size is 4 MB."}, 413 if request.headers.get("cf-ipcountry") == "T1": return {"error":"Image uploads are not allowed through TOR."}, 403 diff --git a/files/templates/admins.html b/files/templates/admins.html index c5c53bc79..bccac2148 100644 --- a/files/templates/admins.html +++ b/files/templates/admins.html @@ -4,7 +4,7 @@ {% block content %} - +

 
Admins
diff --git a/files/templates/award_modal.html b/files/templates/award_modal.html index 311d8cd8e..230c7ee84 100644 --- a/files/templates/award_modal.html +++ b/files/templates/award_modal.html @@ -1,4 +1,4 @@ - +