diff --git a/drama/routes/comments.py b/drama/routes/comments.py index b5d8220ef..17889a0a7 100644 --- a/drama/routes/comments.py +++ b/drama/routes/comments.py @@ -25,7 +25,7 @@ beams_client = PushNotifications( @auth_required def banawardcomment(comment_id, v): - if not v.banawards > 0: return render_template("errors/banaward.html", v=v) + if not v.banawards > 0: abort(402) comment = g.db.query(Comment).filter_by(id=comment_id).first() if not comment: abort(400) diff --git a/drama/routes/posts.py b/drama/routes/posts.py index 3e78fb777..c57a47dc0 100644 --- a/drama/routes/posts.py +++ b/drama/routes/posts.py @@ -49,7 +49,7 @@ def resize(): @auth_required def postbanaward(post_id, v): - if not v.banawards > 0: return render_template("errors/banaward.html", v=v) + if not v.banawards > 0: abort(402) post = g.db.query(Submission).filter_by(id=post_id).first() if not post: abort(400) diff --git a/drama/templates/errors/401.html b/drama/templates/errors/401.html index 29fdf9ac8..4b7c675a9 100644 --- a/drama/templates/errors/401.html +++ b/drama/templates/errors/401.html @@ -14,10 +14,10 @@

401 Not Authorized

-

You need to log in if you want to get into this castle.

+

What you're trying to do requires an account. I think. The original error message said something about a castle and I hated that.

Create an account
Or sign in
-{% endblock %} +{% endblock %} \ No newline at end of file diff --git a/drama/templates/errors/402.html b/drama/templates/errors/402.html index 837566d0a..faa434b1a 100644 --- a/drama/templates/errors/402.html +++ b/drama/templates/errors/402.html @@ -1,19 +1,21 @@ -{% extends "errors/default.html" %} +{% extends "default.html" %} {% block title %} -402 Payment Required +403 Unauthorized {% endblock %} -{% block pagetype %}error-402{% endblock %} +{% block pagetype %}error-405{% endblock %} {% block content %}
- -

402 Payment Required

-

The royal bank has told us that you owe them some coin. You'll need to pay off your debts before you can continue.

-
Go to Coin settings
+ +

403 Unauthorized

+

This page is only available to patrons:

+ https://rdrama.gumroad.com/l/tfcvri +
+ https://patreon.com/Aevann
diff --git a/drama/templates/errors/403.html b/drama/templates/errors/403.html index b6ae227e6..5db3edef3 100644 --- a/drama/templates/errors/403.html +++ b/drama/templates/errors/403.html @@ -12,7 +12,7 @@

403 Forbidden

-

Our security warlocks have cast an impenetrable shield spell around this page.

+

YOU AREN'T WELCOME HERE GO AWAY

Go to frontpage
diff --git a/drama/templates/errors/404.html b/drama/templates/errors/404.html index dbb2ab6c9..2fc33b25d 100644 --- a/drama/templates/errors/404.html +++ b/drama/templates/errors/404.html @@ -12,7 +12,7 @@

404 Page Not Found

-

The internet gremlins have led you to a dark, musty dead-end. There's nothing here.

+

Someone typed something wrong and it was probably you, please do better.

Go to frontpage
diff --git a/drama/templates/errors/405.html b/drama/templates/errors/405.html index 34da0e997..1c2bed416 100644 --- a/drama/templates/errors/405.html +++ b/drama/templates/errors/405.html @@ -12,7 +12,7 @@

405 Method Not Allowed

-

Careful, stranger. The internet gnomes don’t take kindly to outsiders that don’t follow their customs.

+

idk how anyone gets this error but if you see this, remember to follow @carpathianflorist
the original error text here talked about internet gremlins and wtf

Go to frontpage
diff --git a/drama/templates/errors/422.html b/drama/templates/errors/422.html index 29089e64a..086139260 100644 --- a/drama/templates/errors/422.html +++ b/drama/templates/errors/422.html @@ -12,7 +12,7 @@

422 Unprocessable Entity

-

The server thinks you're asking something silly. It might take you more seriously if you take off the jester outfit.

+

STOP BREAKING THINGS PLEASE WHY DO WE HAVE SO MANY ERROR CODES

Go to frontpage
diff --git a/drama/templates/errors/429.html b/drama/templates/errors/429.html index 0e54ebe3e..952288608 100644 --- a/drama/templates/errors/429.html +++ b/drama/templates/errors/429.html @@ -12,7 +12,7 @@

429 Too Many Requests

-

Slow down there, friend! The royal guard doesn't like it when you go that fast!

+

go spam somewhere else nerd

diff --git a/drama/templates/errors/451.html b/drama/templates/errors/451.html index 0a26a5884..95637755b 100644 --- a/drama/templates/errors/451.html +++ b/drama/templates/errors/451.html @@ -13,7 +13,7 @@

451 Unavailable For Legal Reasons

-

By royal decree, we are unable to show this to you right now.

+



fool.

diff --git a/drama/templates/errors/500.html b/drama/templates/errors/500.html index 0754f9523..e978ff1cf 100644 --- a/drama/templates/errors/500.html +++ b/drama/templates/errors/500.html @@ -12,8 +12,8 @@

500 Internal Server Error

-

Something has broken. A master dwarven computersmith has been dispatched to un-break it.

-
Go to frontpage
+

Hiiiii it's carp! I think this error means that there's a timeout error. And I think that means something took too long to load so it decided not to work at all. If you keep seeing this on the same page but not other pages, then something is probably wrong with that specific function. It may not be called a function, but that sounds right to me. Anyway, ping me and I'll whine to someone smarter to fix it. Don't bother them. Thanks ily <3

+
Go to main feed
diff --git a/drama/templates/errors/503.html b/drama/templates/errors/503.html index 5b192d30d..d06954eee 100644 --- a/drama/templates/errors/503.html +++ b/drama/templates/errors/503.html @@ -82,8 +82,8 @@

503 Service Unavailable

-

Drama is unavailable.

-

The server you connected to is most likely being restarted right now. Try again in a few moments.

+

rDrama is unavailable.

+

HI IT'S CARP AGAIN
I'm like 95% sure this error means Aevann is restarting the server to apply a change. But I think that's also 520/521? What causes a 503? No one knows. Wait like a minute (maybe two) and see if it's still happening. It shouldn't. Good luck!

@@ -123,4 +123,4 @@ - + \ No newline at end of file diff --git a/drama/templates/errors/patron.html b/drama/templates/errors/patron.html deleted file mode 100644 index faa434b1a..000000000 --- a/drama/templates/errors/patron.html +++ /dev/null @@ -1,22 +0,0 @@ -{% extends "default.html" %} - -{% block title %} -403 Unauthorized -{% endblock %} - -{% block pagetype %}error-405{% endblock %} - -{% block content %} -
-
-
- -

403 Unauthorized

-

This page is only available to patrons:

- https://rdrama.gumroad.com/l/tfcvri -
- https://patreon.com/Aevann -
-
-
-{% endblock %} \ No newline at end of file