From 666d92aec54468a0f2dbd2a9768aad1ef166d58c Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Sun, 12 Dec 2021 18:31:21 +0200 Subject: [PATCH 1/3] 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 639b2d6c8..387ab44bd 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 b3ff39d04..cafa7ae3e 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 804ebf0ee..197641037 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 e1048b42d..4253a5fba 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 63ebda978..35d81cee6 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 9c4da6d6b..61921fbab 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 cd9fb3e6c..ef032638a 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 769540e99..652b513cb 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 73ef514c0..e96b837cc 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 c4687f4fc..149eadd80 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 1fea4148f..9b6c9a265 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 eb4b8ea14..63f034a5f 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/3] fdsdfs --- .gitignore | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 81e29bfd5..6244fcd0c 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/3] 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 4253a5fba..5ecb1cc32 100644 --- a/files/templates/default.html +++ b/files/templates/default.html @@ -293,7 +293,7 @@ {% endif %} - +