From 666d92aec54468a0f2dbd2a9768aad1ef166d58c Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Sun, 12 Dec 2021 18:31:21 +0200 Subject: [PATCH 1/9] bruh --- files/helpers/const.py | 21 --------------------- files/routes/posts.py | 2 +- files/templates/authforms.html | 4 ++-- files/templates/default.html | 6 +++--- files/templates/log.html | 4 ++-- files/templates/login.html | 2 +- files/templates/login_2fa.html | 2 +- files/templates/settings.html | 2 +- files/templates/settings2.html | 4 ++-- files/templates/sign_up.html | 2 +- files/templates/sign_up_failed_ref.html | 2 +- files/templates/submit.html | 4 ++-- 12 files changed, 17 insertions(+), 38 deletions(-) diff --git a/files/helpers/const.py b/files/helpers/const.py index 639b2d6c80..387ab44bde 100644 --- a/files/helpers/const.py +++ b/files/helpers/const.py @@ -5,18 +5,6 @@ SITE = environ.get("DOMAIN", '').strip() SITE_NAME = environ.get("SITE_NAME", '').strip() AJ_REPLACEMENTS = { - ':': '', - "'": '', - '-': '', - '.': '', - '!': '', - '"': '', - ';': '', - - 'their': '$#3$1', - 'there': 'their', - '$#3$1': 'there', - "you're": '$#3$2', 'your': "you're", '$#3$2': 'your', @@ -24,15 +12,6 @@ AJ_REPLACEMENTS = { "too": '$#3$3', 'to': "too", '$#3$3': 'to', - - '$#3$3': 'to', - '$#3$3': 'to', - '$#3$3': 'to', - - 'she': 'they', - 'her': 'they', - 'he': 'they', - 'him': 'they', } SLURS = { diff --git a/files/routes/posts.py b/files/routes/posts.py index b3ff39d044..cafa7ae3ed 100644 --- a/files/routes/posts.py +++ b/files/routes/posts.py @@ -187,7 +187,7 @@ def post_id(pid, anything=None, v=None): offset = 0 - if post.comment_count > 60: + if not request.headers.get("Authorization") and post.comment_count > 60: comments2 = [] count = 0 if post.created_utc > 1638672040: diff --git a/files/templates/authforms.html b/files/templates/authforms.html index 804ebf0eed..1976410374 100644 --- a/files/templates/authforms.html +++ b/files/templates/authforms.html @@ -14,11 +14,11 @@ {% if v %} - + {% if v.agendaposter %}{% elif v.css %}{% endif %} {% else %} - + {% endif %} diff --git a/files/templates/default.html b/files/templates/default.html index e1048b42d5..4253a5fbaa 100644 --- a/files/templates/default.html +++ b/files/templates/default.html @@ -6,12 +6,12 @@ {% if v %} - + {% if v.agendaposter %}{% elif v.css %}{% endif %} {% else %} - + {% endif %} @@ -293,7 +293,7 @@ {% endif %} - + diff --git a/files/templates/log.html b/files/templates/log.html index 63ebda9789..35d81cee6f 100644 --- a/files/templates/log.html +++ b/files/templates/log.html @@ -6,11 +6,11 @@ {% block content %} {% if v %} - + {% if v.agendaposter %}{% elif v.css %}{% endif %} {% else %} - + {% endif %}
diff --git a/files/templates/login.html b/files/templates/login.html index 9c4da6d6b2..61921fbabb 100644 --- a/files/templates/login.html +++ b/files/templates/login.html @@ -17,7 +17,7 @@ {% endblock %} - + diff --git a/files/templates/login_2fa.html b/files/templates/login_2fa.html index cd9fb3e6cb..ef032638aa 100644 --- a/files/templates/login_2fa.html +++ b/files/templates/login_2fa.html @@ -13,7 +13,7 @@ 2-Step Login - {{'SITE_NAME' | app_config}} - + diff --git a/files/templates/settings.html b/files/templates/settings.html index 769540e991..652b513cb1 100644 --- a/files/templates/settings.html +++ b/files/templates/settings.html @@ -33,7 +33,7 @@ - + {% if v.agendaposter %}{% elif v.css %}{% endif %} diff --git a/files/templates/settings2.html b/files/templates/settings2.html index 73ef514c00..e96b837cc8 100644 --- a/files/templates/settings2.html +++ b/files/templates/settings2.html @@ -38,10 +38,10 @@ {% if v %} - + {% else %} - + {% endif %} diff --git a/files/templates/sign_up.html b/files/templates/sign_up.html index c4687f4fc9..149eadd809 100644 --- a/files/templates/sign_up.html +++ b/files/templates/sign_up.html @@ -30,7 +30,7 @@ {% if ref_user %}{{ref_user.username}} invites you to {{'SITE_NAME' | app_config}}{% else %}Sign up - {{'SITE_NAME' | app_config}}{% endif %} - + diff --git a/files/templates/sign_up_failed_ref.html b/files/templates/sign_up_failed_ref.html index 1fea4148fc..9b6c9a265b 100644 --- a/files/templates/sign_up_failed_ref.html +++ b/files/templates/sign_up_failed_ref.html @@ -31,7 +31,7 @@ {% if ref_user %}{{ref_user.username}} invites you to {{'SITE_NAME' | app_config}}{% else %}{{'SITE_NAME' | app_config}}{% endif %} - + diff --git a/files/templates/submit.html b/files/templates/submit.html index eb4b8ea141..63f034a5f4 100644 --- a/files/templates/submit.html +++ b/files/templates/submit.html @@ -25,11 +25,11 @@ {% block stylesheets %} {% if v %} - + {% if v.agendaposter %}{% elif v.css %}{% endif %} {% else %} - + {% endif %} {% endblock %} From 0b86de0e8c2bb76b16c14bed30dc76c274da671b Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Sun, 12 Dec 2021 18:39:17 +0200 Subject: [PATCH 2/9] fdsdfs --- .gitignore | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 81e29bfd53..6244fcd0cb 100644 --- a/.gitignore +++ b/.gitignore @@ -3,8 +3,8 @@ chart.png video.mp4 video.webm cache/ -images/ -songs/ +/images/ +/songs/ __pycache__/ disablesignups *rules.html From f11b3dfa142a55e96436de38628a22dd48f4afca Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Sun, 12 Dec 2021 18:39:53 +0200 Subject: [PATCH 3/9] sfdfds --- files/templates/default.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/templates/default.html b/files/templates/default.html index 4253a5fbaa..5ecb1cc323 100644 --- a/files/templates/default.html +++ b/files/templates/default.html @@ -293,7 +293,7 @@ {% endif %} - + From 8e8f8c4283e5bb79643c7723106d5519049f2dff Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sun, 12 Dec 2021 11:21:42 -0600 Subject: [PATCH 4/9] fux --- files/templates/settings_filters.html | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/files/templates/settings_filters.html b/files/templates/settings_filters.html index e39bd64056..dc8cb32e9b 100644 --- a/files/templates/settings_filters.html +++ b/files/templates/settings_filters.html @@ -14,11 +14,9 @@
-
- - +
+ +
From e992c3cde98e5bf1d726e124d3d6720406a927b4 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sun, 12 Dec 2021 11:23:34 -0600 Subject: [PATCH 5/9] fx --- files/templates/settings_filters.html | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/files/templates/settings_filters.html b/files/templates/settings_filters.html index dc8cb32e9b..e39bd64056 100644 --- a/files/templates/settings_filters.html +++ b/files/templates/settings_filters.html @@ -14,9 +14,11 @@
-
- - +
+ +
From 156c8469bfdf586231ad304b06f75922dad26a91 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sun, 12 Dec 2021 11:25:52 -0600 Subject: [PATCH 6/9] fix --- files/templates/settings.html | 2 ++ files/templates/settings2.html | 2 ++ 2 files changed, 4 insertions(+) diff --git a/files/templates/settings.html b/files/templates/settings.html index 9e09b82909..c5ccf5a1fc 100644 --- a/files/templates/settings.html +++ b/files/templates/settings.html @@ -174,6 +174,8 @@
+ + {% if v %} {% include "/modals/Modal2FA.html" %} {% endif %} diff --git a/files/templates/settings2.html b/files/templates/settings2.html index e96b837cc8..b7c871b676 100644 --- a/files/templates/settings2.html +++ b/files/templates/settings2.html @@ -149,6 +149,8 @@
+ + {% block mobilenavbar %} {% include "mobile_navigation_bar.html" %} {% endblock %} From c795f8db2ffe61555434e19093a080b317fe3035 Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sun, 12 Dec 2021 11:27:57 -0600 Subject: [PATCH 7/9] fix --- files/templates/settings_filters.html | 13 +++++++++++++ files/templates/submission/SubmissionAwards.html | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/files/templates/settings_filters.html b/files/templates/settings_filters.html index e39bd64056..a65afc8ff5 100644 --- a/files/templates/settings_filters.html +++ b/files/templates/settings_filters.html @@ -10,6 +10,19 @@
+

Grinch Mode

+ +
+ +
+ + +
+ +
+

Highlight New Comments

diff --git a/files/templates/submission/SubmissionAwards.html b/files/templates/submission/SubmissionAwards.html index 484456458d..521370ba39 100644 --- a/files/templates/submission/SubmissionAwards.html +++ b/files/templates/submission/SubmissionAwards.html @@ -120,7 +120,7 @@ {% endif %} -{% if v and not v.grinch %} +{% if v and not v.grincheffect %} {% if p.award_count("snow") and p.award_count("fireplace") %} {% elif p.award_count("fireplace")%} From b112e9dab4511fab3519c102b004dc0832e31d3c Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sun, 12 Dec 2021 11:28:20 -0600 Subject: [PATCH 8/9] fix --- files/templates/settings_filters.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/templates/settings_filters.html b/files/templates/settings_filters.html index a65afc8ff5..ab6d1807ff 100644 --- a/files/templates/settings_filters.html +++ b/files/templates/settings_filters.html @@ -17,7 +17,7 @@
From a438474f0284dd8707d6ff8231e80f9baf2053af Mon Sep 17 00:00:00 2001 From: kek7198 Date: Sun, 12 Dec 2021 11:28:34 -0600 Subject: [PATCH 9/9] fix --- files/templates/settings_filters.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/templates/settings_filters.html b/files/templates/settings_filters.html index ab6d1807ff..1bd6cb67b8 100644 --- a/files/templates/settings_filters.html +++ b/files/templates/settings_filters.html @@ -16,7 +16,7 @@
-