From 144793d2a15e8cd9e3ffe2806763b83ff1bf824e Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Tue, 14 Dec 2021 02:55:14 +0200 Subject: [PATCH 1/5] sdfsdf --- files/templates/submit.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/templates/submit.html b/files/templates/submit.html index b46eac13d8..dcbdf8072b 100644 --- a/files/templates/submit.html +++ b/files/templates/submit.html @@ -83,7 +83,7 @@ Optional if you have text. - You can upload images or videos up to 1 minute long. + You can upload images or videos. From 091e77fa47b9208f088428fd1276576649a6c5c0 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Tue, 14 Dec 2021 02:59:33 +0200 Subject: [PATCH 2/5] fdsfds --- files/helpers/sanitize.py | 16 ++++++++-------- files/templates/authforms.html | 4 ++-- files/templates/default.html | 4 ++-- files/templates/log.html | 4 ++-- 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 ++-- 10 files changed, 22 insertions(+), 22 deletions(-) diff --git a/files/helpers/sanitize.py b/files/helpers/sanitize.py index bf286cec4b..7f67f7c5f2 100644 --- a/files/helpers/sanitize.py +++ b/files/helpers/sanitize.py @@ -170,16 +170,16 @@ def sanitize(sanitized, noimages=False): for i in re.finditer('(?', sanitized, flags=re.I) + sanitized = re.sub(f'(?', sanitized, flags=re.I) elif path.isfile(f'./files/assets/images/emojis/{emoji}.webp'): - sanitized = re.sub(f'(?', sanitized, flags=re.I) + sanitized = re.sub(f'(?', sanitized, flags=re.I) sanitized = sanitized.replace("https://www.", "https://").replace("https://youtu.be/", "https://youtube.com/watch?v=").replace("https://music.youtube.com/watch?v=", "https://youtube.com/watch?v=").replace("https://open.spotify.com/", "https://open.spotify.com/embed/").replace("https://streamable.com/", "https://streamable.com/e/").replace("https://youtube.com/shorts/", "https://youtube.com/watch?v=").replace("https://mobile.twitter", "https://twitter").replace("https://m.facebook", "https://facebook").replace("https://m.wikipedia", "https://wikipedia").replace("https://m.youtube", "https://youtube") @@ -240,10 +240,10 @@ def filter_emojis_only(title): if emoji.startswith("!"): emoji = emoji[1:] if path.isfile(f'./files/assets/images/emojis/{emoji}.webp'): - title = re.sub(f'(?', title, flags=re.I) + title = re.sub(f'(?', title, flags=re.I) elif path.isfile(f'./files/assets/images/emojis/{emoji}.webp'): - title = re.sub(f'(?', title, flags=re.I) + title = re.sub(f'(?', title, flags=re.I) if len(title) > 1500: abort(400) else: return title \ No newline at end of file diff --git a/files/templates/authforms.html b/files/templates/authforms.html index 2ae52f79cd..85219c78b7 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 1410e15d85..d549814ec8 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 %} diff --git a/files/templates/log.html b/files/templates/log.html index e653deefaf..46cf16fc66 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_2fa.html b/files/templates/login_2fa.html index 55c57813aa..4f1d8d053a 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 b76e9725a3..36d73fffb8 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 49b490dbd9..c4ee0efee8 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 9796254a8e..d0c52476dd 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 05da6df054..338b64bb45 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 dcbdf8072b..76d25b310a 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 77483f97506e6e7af62de7a15d2f83d84dd1a0d8 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Tue, 14 Dec 2021 03:43:22 +0200 Subject: [PATCH 3/5] fdsfds --- files/helpers/const.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/helpers/const.py b/files/helpers/const.py index 416a878f4a..7470350403 100644 --- a/files/helpers/const.py +++ b/files/helpers/const.py @@ -140,7 +140,7 @@ elif SITE == "pcmemes.net": LONGPOSTBOT_ID = 1832 ZOZBOT_ID = 1833 AUTOPOLLER_ID = 3369 - AUTOBETTER_ID = 0 + AUTOBETTER_ID = 1867 TAX_RECEIVER_ID = 1592 PIZZA_SHILL_ID = 0 IDIO_ID = 0 From 24b8adc39e968eb42cb0721d325233d25792f483 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Tue, 14 Dec 2021 04:05:54 +0200 Subject: [PATCH 4/5] fdsdfs --- files/templates/login.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/files/templates/login.html b/files/templates/login.html index 96fde67e1c..f71fb57f38 100644 --- a/files/templates/login.html +++ b/files/templates/login.html @@ -17,7 +17,8 @@ {% endblock %} - + + From 48ef8e3380fb69a3f0d0c61cad812acaaf6706da Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Tue, 14 Dec 2021 04:07:50 +0200 Subject: [PATCH 5/5] sfsfd --- files/classes/comment.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/classes/comment.py b/files/classes/comment.py index d8facb88b2..628f8b8335 100644 --- a/files/classes/comment.py +++ b/files/classes/comment.py @@ -297,7 +297,7 @@ class Comment(Base): return data data["author"]=self.author.json_core - data["post"]=self.post.json_core + data["post"]=self.post.json_core if self.post else '' if self.level >= 2: data["parent"]=self.parent.json_core