From f30ae250875c46fe08d53466a29ef20b9c243d5f Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Tue, 18 Jan 2022 02:57:11 +0200 Subject: [PATCH] fds --- files/templates/authforms.html | 2 +- files/templates/comments.html | 2 +- files/templates/errors/400.html | 2 +- files/templates/errors/401.html | 2 +- files/templates/errors/403.html | 2 +- files/templates/errors/404.html | 2 +- files/templates/errors/405.html | 2 +- files/templates/errors/429.html | 2 +- files/templates/errors/500.html | 2 +- files/templates/errors/nsfw.html | 2 +- files/templates/errors/patron.html | 2 +- files/templates/formatting.html | 8 ++++---- files/templates/header.html | 2 +- files/templates/log.html | 4 ++-- files/templates/login.html | 2 +- files/templates/login_2fa.html | 2 +- files/templates/marseys.html | 2 +- files/templates/sign_up.html | 2 +- files/templates/sign_up_failed_ref.html | 2 +- files/templates/submission_listing.html | 4 ++-- files/templates/userpage.html | 4 ++-- 21 files changed, 27 insertions(+), 27 deletions(-) diff --git a/files/templates/authforms.html b/files/templates/authforms.html index 8acced610a..dbe50eb394 100644 --- a/files/templates/authforms.html +++ b/files/templates/authforms.html @@ -111,7 +111,7 @@
- cover + cover diff --git a/files/templates/comments.html b/files/templates/comments.html index 304939fb3f..e04b4afe38 100644 --- a/files/templates/comments.html +++ b/files/templates/comments.html @@ -219,7 +219,7 @@ 👻 {% else %} @{{c.author_name}}'s profile picture{{c.author_name}} - {% if c.author.customtitle %}  {% if c.author.quadrant %}{{c.author.quadrant}} quadrant{% endif %}{{c.author.customtitle | safe}}{% endif %} + {% if c.author.customtitle %}  {% if c.author.quadrant %}{{c.author.quadrant}} quadrant{% endif %}{{c.author.customtitle | safe}}{% endif %} {% endif %} {% if c.parent_comment_id and not standalone and level != 1 %}{{c.parent_comment.author_name}}{% endif %} diff --git a/files/templates/errors/400.html b/files/templates/errors/400.html index 275a31a807..9a5bb25ab3 100644 --- a/files/templates/errors/400.html +++ b/files/templates/errors/400.html @@ -10,7 +10,7 @@
- :#marseybrainlet: + :#marseybrainlet:

 			

400 Bad Request

That request was bad and you should feel bad.

diff --git a/files/templates/errors/401.html b/files/templates/errors/401.html index 1965d0178d..f06f671abe 100644 --- a/files/templates/errors/401.html +++ b/files/templates/errors/401.html @@ -11,7 +11,7 @@
- :#marseydead: + :#marseydead:

 
 			

401 Not Authorized

diff --git a/files/templates/errors/403.html b/files/templates/errors/403.html index c2e239ce8c..8b13dbcf6b 100644 --- a/files/templates/errors/403.html +++ b/files/templates/errors/403.html @@ -10,7 +10,7 @@
- :#marseytroll: + :#marseytroll:

 		

403 Forbidden

YOU AREN'T WELCOME HERE GO AWAY

diff --git a/files/templates/errors/404.html b/files/templates/errors/404.html index 3a6a221e85..20cfe3d9ce 100644 --- a/files/templates/errors/404.html +++ b/files/templates/errors/404.html @@ -10,7 +10,7 @@
- :#marseyconfused + :#marseyconfused

 		

404 Page Not Found

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

diff --git a/files/templates/errors/405.html b/files/templates/errors/405.html index 0dd47fda11..a847afc17b 100644 --- a/files/templates/errors/405.html +++ b/files/templates/errors/405.html @@ -10,7 +10,7 @@
- :#marseyretard: + :#marseyretard:

 		

405 Method Not Allowed

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

diff --git a/files/templates/errors/429.html b/files/templates/errors/429.html index 871bddf33a..2fa741fda6 100644 --- a/files/templates/errors/429.html +++ b/files/templates/errors/429.html @@ -10,7 +10,7 @@
- :#marseyrentfree: + :#marseyrentfree:

 		

429 Too Many Requests

go spam somewhere else nerd

diff --git a/files/templates/errors/500.html b/files/templates/errors/500.html index b1c65e0374..62dbea842a 100644 --- a/files/templates/errors/500.html +++ b/files/templates/errors/500.html @@ -10,7 +10,7 @@
- :#marseydead: + :#marseydead:

 			

500 Internal Server Error

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

diff --git a/files/templates/errors/nsfw.html b/files/templates/errors/nsfw.html index 4a39446f72..58d7126d5c 100644 --- a/files/templates/errors/nsfw.html +++ b/files/templates/errors/nsfw.html @@ -10,7 +10,7 @@
- :#marseytwerking: + :#marseytwerking:

Are you over 18?

This post is rated +18 (Adult-Only). You must be 18 or older to continue. Are you sure you want to proceed?

diff --git a/files/templates/errors/patron.html b/files/templates/errors/patron.html index 63e09cbacd..28f9524917 100644 --- a/files/templates/errors/patron.html +++ b/files/templates/errors/patron.html @@ -10,7 +10,7 @@
- :#marseymerchant: + :#marseymerchant:

401 Not Authorized

This page is only available to {% if request.host == "rdrama.net" %}paypigs{% else %}patrons{% endif %}:

{{'GUMROAD_LINK' | app_config}} diff --git a/files/templates/formatting.html b/files/templates/formatting.html index aef2141994..c8243dc188 100644 --- a/files/templates/formatting.html +++ b/files/templates/formatting.html @@ -69,22 +69,22 @@ You can use Markdown formatting: Emojis :marseylove: - :marseylove: + :marseylove: Mirrored Emojis :!marseylove: - :!marseylove: + :!marseylove: Large Emojis :#marseylove: - :!marseylove: + :!marseylove: Large Mirroed Emojis :#!marseylove: - :!marseylove: + :!marseylove: Poll Options diff --git a/files/templates/header.html b/files/templates/header.html index 6cd6832bae..0fb5f3b6b7 100644 --- a/files/templates/header.html +++ b/files/templates/header.html @@ -10,7 +10,7 @@ header icon {% if request.host != 'pcmemes.net' %} - logo + logo {% endif %}
diff --git a/files/templates/log.html b/files/templates/log.html index 9b29ed20be..89ab68b6d8 100644 --- a/files/templates/log.html +++ b/files/templates/log.html @@ -56,10 +56,10 @@ diff --git a/files/templates/login_2fa.html b/files/templates/login_2fa.html index ac86806263..bd12da70f4 100644 --- a/files/templates/login_2fa.html +++ b/files/templates/login_2fa.html @@ -94,7 +94,7 @@
- cover + cover
diff --git a/files/templates/marseys.html b/files/templates/marseys.html index 8d4c6afbb0..a9d01595b2 100644 --- a/files/templates/marseys.html +++ b/files/templates/marseys.html @@ -19,7 +19,7 @@ {{loop.index}} {{k[0]}} - :{{k[0]}}: + :{{k[0]}}: {{k[2]}} {% if k[1] in ('anton-d','unknown') %}{{k[1]}}{% else %}@{{k[1]}}'s profile picture{{k[1]}}{% endif %} diff --git a/files/templates/sign_up.html b/files/templates/sign_up.html index 1f2ed363c4..fe23959c1c 100644 --- a/files/templates/sign_up.html +++ b/files/templates/sign_up.html @@ -146,7 +146,7 @@
- cover + cover
diff --git a/files/templates/sign_up_failed_ref.html b/files/templates/sign_up_failed_ref.html index b1577cbb25..e507efcc98 100644 --- a/files/templates/sign_up_failed_ref.html +++ b/files/templates/sign_up_failed_ref.html @@ -84,7 +84,7 @@
- cover + cover
diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html index ef1e2b5f1d..63b9a69248 100644 --- a/files/templates/submission_listing.html +++ b/files/templates/submission_listing.html @@ -133,7 +133,7 @@
{% if p.club and not (v and (v.paid_dues or v.id == p.author_id)) %} - post thumnail + post thumnail {% elif not p.url %} post thumnail @@ -189,7 +189,7 @@ {% if p.active_flags %}{{p.active_flags}} Reports{% endif %} {% if p.author.verified %} {% endif %} - @{{p.author.profile_url}}'s profile picture{{p.author.username}}{% if p.author.customtitle %}  {% if p.author.quadrant %}{{p.author.quadrant}} quadrant{% endif %}{{p.author.customtitle | safe}}{% endif %} + @{{p.author.profile_url}}'s profile picture{{p.author.username}}{% if p.author.customtitle %}  {% if p.author.quadrant %}{{p.author.quadrant}} quadrant{% endif %}{{p.author.customtitle | safe}}{% endif %}  {{p.age_string}}   ({% if p.is_image %}image post{% elif p.is_video %}video post{% elif p.realurl(v) %}{{p.domain}}{% else %}text post{% endif %}) diff --git a/files/templates/userpage.html b/files/templates/userpage.html index f7d61222a6..6964c3941e 100644 --- a/files/templates/userpage.html +++ b/files/templates/userpage.html @@ -95,7 +95,7 @@
- {% if u.customtitle %}

{% if u.quadrant %}{{u.quadrant}} quadrant{% endif %}{{u.customtitle | safe}}

+ {% if u.customtitle %}

{% if u.quadrant %}{{u.quadrant}} quadrant{% endif %}{{u.customtitle | safe}}

{% else %}

 				{% endif %}
 
@@ -368,7 +368,7 @@
 				{% if v and v.has_follower(u) and not v.is_nofollow %}
 					Follows you
 				{% endif %}
-				{% if u.customtitle %}

{% if u.quadrant %}@{{u.quadrant}} quadrant{% endif %}{{u.customtitle | safe}}

+ {% if u.customtitle %}

{% if u.quadrant %}@{{u.quadrant}} quadrant{% endif %}{{u.customtitle | safe}}

{% else %}

 				{% endif %}