forked from MarseyWorld/MarseyWorld
remove unneeded templates, use custom handler for 500, and 401 is "Unauthorized," not "Not Authorized"
parent
fd25809cac
commit
ac011a77b9
|
|
@ -85,13 +85,13 @@ def error(e):
|
||||||
if WERKZEUG_ERROR_DESCRIPTIONS.get(e.code, None) == details:
|
if WERKZEUG_ERROR_DESCRIPTIONS.get(e.code, None) == details:
|
||||||
details = None
|
details = None
|
||||||
if request.headers.get("Authorization") or request.headers.get("xhr"):
|
if request.headers.get("Authorization") or request.headers.get("xhr"):
|
||||||
return {"error": msg, "code": e.code, "details": details}
|
return {"error": title, "code": e.code, "description": msg, "details": details}
|
||||||
img = ERROR_MARSEYS.get(e.code, 'marseyl')
|
img = ERROR_MARSEYS.get(e.code, 'marseyl')
|
||||||
return render_template('errors/error.html', err=True, title=title, msg=msg, details=details, img=img), e.code
|
return render_template('errors/error.html', err=True, title=title, msg=msg, details=details, img=img), e.code
|
||||||
|
|
||||||
@app.errorhandler(401)
|
@app.errorhandler(401)
|
||||||
def error_401(e):
|
def error_401(e):
|
||||||
if request.headers.get("Authorization") or request.headers.get("xhr"): return {"error": "401 Not Authorized"}, 401
|
if request.headers.get("Authorization") or request.headers.get("xhr"): return {"error": "401 Unauthorized"}, 401
|
||||||
else:
|
else:
|
||||||
path = request.path
|
path = request.path
|
||||||
qs = urlencode(dict(request.values))
|
qs = urlencode(dict(request.values))
|
||||||
|
|
@ -103,7 +103,8 @@ def error_401(e):
|
||||||
@app.errorhandler(500)
|
@app.errorhandler(500)
|
||||||
def error_500(e):
|
def error_500(e):
|
||||||
g.db.rollback()
|
g.db.rollback()
|
||||||
return error(e)
|
if request.headers.get("Authorization") or request.headers.get("xhr"): return {"error": "500 Internal Server Error"}, 500
|
||||||
|
else: return render_template('errors/500.html', err=True), 500
|
||||||
|
|
||||||
|
|
||||||
@app.post("/allow_nsfw")
|
@app.post("/allow_nsfw")
|
||||||
|
|
|
||||||
|
|
@ -1,20 +0,0 @@
|
||||||
{% extends "default.html" %}
|
|
||||||
|
|
||||||
{% block title %}
|
|
||||||
<title>400 Bad Request</title>
|
|
||||||
{% endblock %}
|
|
||||||
|
|
||||||
{% block pagetype %}error-400{% endblock %}
|
|
||||||
|
|
||||||
{% block content %}
|
|
||||||
<div class="row justify-content-center">
|
|
||||||
<div class="col-10 col-md-5">
|
|
||||||
<div class="text-center px-3 my-8">
|
|
||||||
<img alt=":#marseybrainlet:" loading="lazy" src="/e/marseybrainlet.webp">
|
|
||||||
<pre></pre>
|
|
||||||
<h1 class="h5">400 Bad Request</h1>
|
|
||||||
<p class="text-muted mb-5">That request was bad and you should feel bad.</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{% endblock %}
|
|
||||||
|
|
@ -1,21 +0,0 @@
|
||||||
{% extends "default.html" %}
|
|
||||||
|
|
||||||
{% block title %}
|
|
||||||
<title>403 Forbidden</title>
|
|
||||||
{% endblock %}
|
|
||||||
|
|
||||||
{% block pagetype %}error-403{% endblock %}
|
|
||||||
|
|
||||||
{% block content %}
|
|
||||||
<div class="row justify-content-center">
|
|
||||||
<div class="col-10 col-md-5">
|
|
||||||
<div class="text-center px-3 my-8">
|
|
||||||
<img alt=":#marseytroll:" loading="lazy" src="/e/marseytroll.webp">
|
|
||||||
<pre></pre>
|
|
||||||
<h1 class="h5">403 Forbidden</h1>
|
|
||||||
<p class="text-muted mb-5">{{description}}</p>
|
|
||||||
<div><a href="/" class="btn btn-primary">Go to frontpage</a></div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{% endblock %}
|
|
||||||
|
|
@ -1,21 +0,0 @@
|
||||||
{% extends "default.html" %}
|
|
||||||
|
|
||||||
{% block title %}
|
|
||||||
<title>404 Page Not Found</title>
|
|
||||||
{% endblock %}
|
|
||||||
|
|
||||||
{% block pagetype %}error-404{% endblock %}
|
|
||||||
|
|
||||||
{% block content %}
|
|
||||||
<div class="row justify-content-center">
|
|
||||||
<div class="col-10 col-md-5">
|
|
||||||
<div class="text-center px-3 my-8">
|
|
||||||
<img alt=":#marseyconfused" loading="lazy" src="/e/marseyconfused.webp">
|
|
||||||
<pre></pre>
|
|
||||||
<h1 class="h5">404 Page Not Found</h1>
|
|
||||||
<p class="text-muted mb-5">Someone typed something wrong and it was probably you, please do better.</p>
|
|
||||||
<div><a href="/" class="btn btn-primary">Go to frontpage</a></div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{% endblock %}
|
|
||||||
|
|
@ -1,21 +0,0 @@
|
||||||
{% extends "default.html" %}
|
|
||||||
|
|
||||||
{% block title %}
|
|
||||||
<title>405 Method Not Allowed</title>
|
|
||||||
{% endblock %}
|
|
||||||
|
|
||||||
{% block pagetype %}error-405{% endblock %}
|
|
||||||
|
|
||||||
{% block content %}
|
|
||||||
<div class="row justify-content-center">
|
|
||||||
<div class="col-10 col-md-5">
|
|
||||||
<div class="text-center px-3 my-8">
|
|
||||||
<img alt=":#marseyretard:" loading="lazy" src="/e/marseyretard.webp">
|
|
||||||
<pre></pre>
|
|
||||||
<h1 class="h5">405 Method Not Allowed</h1>
|
|
||||||
<p class="text-muted mb-5">idk how anyone gets this error but if you see this, remember to follow @carpathianflorist<BR>the original error text here talked about internet gremlins and wtf</p>
|
|
||||||
<div><a href="/" class="btn btn-primary">Go to frontpage</a></div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{% endblock %}
|
|
||||||
|
|
@ -1,21 +0,0 @@
|
||||||
{% extends "default.html" %}
|
|
||||||
|
|
||||||
{% block title %}
|
|
||||||
<title>Too many pings</title>
|
|
||||||
{% endblock %}
|
|
||||||
|
|
||||||
{% block pagetype %}Too many pings{% endblock %}
|
|
||||||
|
|
||||||
{% block content %}
|
|
||||||
<div class="row justify-content-center">
|
|
||||||
<div class="col-10 col-md-5">
|
|
||||||
<div class="text-center px-3 my-8">
|
|
||||||
<img alt=":#marseyrage" loading="lazy" src="/e/marseyrage.webp">
|
|
||||||
<pre></pre>
|
|
||||||
<h1 class="h5">Too many pings</h1>
|
|
||||||
<p class="text-muted mb-5">Max limit is 5 for comments and 50 for posts</p>
|
|
||||||
<div><a href="/" class="btn btn-primary">Go to frontpage</a></div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{% endblock %}
|
|
||||||
|
|
@ -1,20 +0,0 @@
|
||||||
{% extends "default.html" %}
|
|
||||||
|
|
||||||
{% block title %}
|
|
||||||
<title>Max image/audio size is 8 MB (16 MB for paypigs)</title>
|
|
||||||
{% endblock %}
|
|
||||||
|
|
||||||
{% block pagetype %}error-413{% endblock %}
|
|
||||||
|
|
||||||
{% block content %}
|
|
||||||
<div class="row justify-content-center">
|
|
||||||
<div class="col-10 col-md-5">
|
|
||||||
<div class="text-center px-3 my-8">
|
|
||||||
<img alt=":#marseyretard:" loading="lazy" src="/e/marseychonker2.webp">
|
|
||||||
<pre></pre>
|
|
||||||
<h1 class="h5">Max image/audio size is 8 MB (16 MB for paypigs)</h1>
|
|
||||||
<div><a href="/" class="btn btn-primary">Go to frontpage</a></div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{% endblock %}
|
|
||||||
|
|
@ -1,20 +0,0 @@
|
||||||
{% extends "default.html" %}
|
|
||||||
|
|
||||||
{% block title %}
|
|
||||||
<title>Max video size is 32 MB (64 MB for paypigs)</title>
|
|
||||||
{% endblock %}
|
|
||||||
|
|
||||||
{% block pagetype %}error-414{% endblock %}
|
|
||||||
|
|
||||||
{% block content %}
|
|
||||||
<div class="row justify-content-center">
|
|
||||||
<div class="col-10 col-md-5">
|
|
||||||
<div class="text-center px-3 my-8">
|
|
||||||
<img alt=":#marseyretard:" loading="lazy" src="/e/marseychonker2.webp">
|
|
||||||
<pre></pre>
|
|
||||||
<h1 class="h5">Max video size is 32 MB (64 MB for paypigs)</h1>
|
|
||||||
<div><a href="/" class="btn btn-primary">Go to frontpage</a></div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{% endblock %}
|
|
||||||
|
|
@ -1,20 +0,0 @@
|
||||||
{% extends "default.html" %}
|
|
||||||
|
|
||||||
{% block title %}
|
|
||||||
<title>415 Unsupported Media Type</title>
|
|
||||||
{% endblock %}
|
|
||||||
|
|
||||||
{% block pagetype %}error-415{% endblock %}
|
|
||||||
|
|
||||||
{% block content %}
|
|
||||||
<div class="row justify-content-center">
|
|
||||||
<div class="col-10 col-md-5">
|
|
||||||
<div class="text-center px-3 my-8">
|
|
||||||
<img alt=":#marseydetective:" loading="lazy" src="/e/marseydetective.webp">
|
|
||||||
<pre></pre>
|
|
||||||
<h1 class="h5">415 Unsupported Media Type</h1>
|
|
||||||
<p class="text-muted mb-5">Please upload only Image, Video, or Audio files!</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{% endblock %}
|
|
||||||
|
|
@ -1,20 +0,0 @@
|
||||||
{% extends "default.html" %}
|
|
||||||
|
|
||||||
{% block title %}
|
|
||||||
<title>WEBM videos are not allowed</title>
|
|
||||||
{% endblock %}
|
|
||||||
|
|
||||||
{% block pagetype %}error-418{% endblock %}
|
|
||||||
|
|
||||||
{% block content %}
|
|
||||||
<div class="row justify-content-center">
|
|
||||||
<div class="col-10 col-md-5">
|
|
||||||
<div class="text-center px-3 my-8">
|
|
||||||
<img alt=":#marseytea:" loading="lazy" src="/e/marseytea.webp">
|
|
||||||
<pre></pre>
|
|
||||||
<h1 class="h5">WEBM videos are not allowed</h1>
|
|
||||||
<div><a href="/" class="btn btn-primary">Please convert your video to MP4 and re-upload it!</a></div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{% endblock %}
|
|
||||||
|
|
@ -1,20 +0,0 @@
|
||||||
{% extends "default.html" %}
|
|
||||||
|
|
||||||
{% block title %}
|
|
||||||
<title>429 Too Many Requests</title>
|
|
||||||
{% endblock %}
|
|
||||||
|
|
||||||
{% block pagetype %}error-429{% endblock %}
|
|
||||||
|
|
||||||
{% block content %}
|
|
||||||
<div class="row justify-content-center">
|
|
||||||
<div class="col-10 col-md-5">
|
|
||||||
<div class="text-center px-3 my-8">
|
|
||||||
<img alt=":#marseyrentfree:" loading="lazy" src="/e/marseyrentfree.webp">
|
|
||||||
<pre></pre>
|
|
||||||
<h1 class="h5">429 Too Many Requests</h1>
|
|
||||||
<p class="text-muted mb-5">go spam somewhere else nerd</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{% endblock %}
|
|
||||||
Loading…
Reference in New Issue