From 6073135eec29759802369563fb13cee99efab262 Mon Sep 17 00:00:00 2001 From: FatherHal <95137430+FatherHal@users.noreply.github.com> Date: Tue, 7 Dec 2021 20:11:48 -0700 Subject: [PATCH 01/30] Update snappy_Drama.txt --- snappy_Drama.txt | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/snappy_Drama.txt b/snappy_Drama.txt index 3d59ccf3a3..962e1d8d65 100644 --- a/snappy_Drama.txt +++ b/snappy_Drama.txt @@ -2769,3 +2769,13 @@ I only follow the patriarchal aspects of Islam. Not the aspects that make you a {[para]} There are only two rules: no bigotry and no /r/drama users. {[para]} +hey, last night was fun but after watching you eat the rolls as soon as they came to the table I don't think I want to continue this. +{[para]} +I've posted my created memes for over a decade(s) across the chans, and onto almost EVERY FREE SPEECH SITE. So much of the internet's humor is from me for a very long time. + +So many memes that are world famous are MINE. Mine mine mine. +{[para]} +I SENSE YOU ARE TRYING TO DOXX ME in a clumsy probing manner. + +DOXXING is frowned upon on all free speech sites. +{[para]} From d3765493aa6cd66a92b7c96ca67e6fb28c7a1684 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Wed, 8 Dec 2021 18:35:31 +0200 Subject: [PATCH 02/30] gdf --- files/templates/formatting.html | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/files/templates/formatting.html b/files/templates/formatting.html index a96cbec460..9c82f9f9e3 100644 --- a/files/templates/formatting.html +++ b/files/templates/formatting.html @@ -122,12 +122,6 @@ These Markdown tags format an entire paragraph of text at a time. Code Block ```
Use three backticks above and below.
Or, indent the lines with four spaces.
``` - - - - Spoilers - <s> bussy > gussy </s> -

bussy > gussy

 				Use three backticks above and below.
@@ -135,6 +129,11 @@ These Markdown tags format an entire paragraph of text at a time.
+ + Spoilers + <s> bussy > gussy </s> +

bussy > gussy

+ @@ -285,7 +284,6 @@ Text 2 Italics <i>This</i> is how you get italics. - This is how you get italics. This is how you get italics. @@ -547,6 +545,9 @@ line breaks overflow: auto; } } + pre { + color: var(--white) !important; + } {% endblock %} \ No newline at end of file From b04db8bfce9cddd36c9a38757479e281be6e0988 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Wed, 8 Dec 2021 18:54:56 +0200 Subject: [PATCH 03/30] dfsfds --- files/templates/authforms.html | 4 +- files/templates/default.html | 4 +- files/templates/formatting.html | 56 +++++++------------------ 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/submission.html | 4 +- files/templates/submission_listing.html | 2 +- files/templates/submit.html | 4 +- 12 files changed, 33 insertions(+), 57 deletions(-) diff --git a/files/templates/authforms.html b/files/templates/authforms.html index d46907db0b..b9e65377f1 100644 --- a/files/templates/authforms.html +++ b/files/templates/authforms.html @@ -13,11 +13,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 89007c301e..f12641de0f 100644 --- a/files/templates/default.html +++ b/files/templates/default.html @@ -5,12 +5,12 @@ {% if v %} - + {% if v.agendaposter %}{% elif v.css %}{% endif %} {% else %} - + {% endif %} diff --git a/files/templates/formatting.html b/files/templates/formatting.html index 9c82f9f9e3..2acbd8dd98 100644 --- a/files/templates/formatting.html +++ b/files/templates/formatting.html @@ -9,16 +9,14 @@ -

Formatting

+

Markdown Formatting

-On {{'SITE_NAME' | app_config}}, you can use Markdown formatting. +You can use Markdown formatting.
-

Inline formatting

- @@ -53,6 +51,17 @@ On {{'SITE_NAME' | app_config}}, you can use Markdown formatting. + + + + + + + + + + + @@ -83,22 +92,6 @@ On {{'SITE_NAME' | app_config}}, you can use Markdown formatting. - -
[{{'SITE_NAME' | app_config}}]({{request.host_url}}) {{'SITE_NAME' | app_config}}
Imageshttps://i.imgur.com/Lf6dfPO.jpg
Videos[{{'SITE_NAME' | app_config}}]({{request.host_url}})
Emojis :marseylove:
- -

Block formatting

- -These Markdown tags format an entire paragraph of text at a time. - - - - - - - - - - @@ -134,23 +127,6 @@ These Markdown tags format an entire paragraph of text at a time. - -
NameTypeDisplays as
Blockquote > text<s> bussy > gussy </s>

bussy > gussy
- - -

Custom Formatting

- -We also have some custom hooks for mentioning users and subreddits. Note that these only work if the mentioned user or subreddit actually exists. - - - - - - - - - - @@ -169,7 +145,7 @@ We also have some custom hooks for mentioning users and subreddits. Note that th
NameTypeDisplays as
Username Mention @QuadNarca
-

Custom HTML

+

HTML Formatting

And we allow custom HTML in most places. @@ -449,10 +425,10 @@ line breaks Images - <img src="https://i.imgur.com/SwVuagI_d.webp" width="200"> + <img src="https://i.imgur.com/Lf6dfPO.jpg" width="200"> - + diff --git a/files/templates/log.html b/files/templates/log.html index e1ca1e331c..59ae8ffc61 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 99059ed080..7c80270a39 100644 --- a/files/templates/login_2fa.html +++ b/files/templates/login_2fa.html @@ -12,7 +12,7 @@ 2-Step Login - {{'SITE_NAME' | app_config}} - + diff --git a/files/templates/settings.html b/files/templates/settings.html index 04c0566f41..c1837701c1 100644 --- a/files/templates/settings.html +++ b/files/templates/settings.html @@ -31,7 +31,7 @@ - + {% if v.agendaposter %}{% elif v.css %}{% endif %} diff --git a/files/templates/settings2.html b/files/templates/settings2.html index 360570ef96..b0ee435ca3 100644 --- a/files/templates/settings2.html +++ b/files/templates/settings2.html @@ -36,10 +36,10 @@ {% if v %} - + {% else %} - + {% endif %} diff --git a/files/templates/sign_up.html b/files/templates/sign_up.html index b6d249593e..8f36255ce6 100644 --- a/files/templates/sign_up.html +++ b/files/templates/sign_up.html @@ -28,7 +28,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 62b0973f60..e72376ccf2 100644 --- a/files/templates/sign_up_failed_ref.html +++ b/files/templates/sign_up_failed_ref.html @@ -29,7 +29,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/submission.html b/files/templates/submission.html index da99c2b4c3..dc7bc0005f 100644 --- a/files/templates/submission.html +++ b/files/templates/submission.html @@ -454,8 +454,8 @@ {% elif p.url and p.url.lower().endswith('.mp4') %}
-
diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html index d679f2588c..3c15572cdd 100644 --- a/files/templates/submission_listing.html +++ b/files/templates/submission_listing.html @@ -487,7 +487,7 @@ {% if p.url and p.url.lower().endswith('.mp4') %}
-
diff --git a/files/templates/submit.html b/files/templates/submit.html index 416b7e0101..5d5cd39288 100644 --- a/files/templates/submit.html +++ b/files/templates/submit.html @@ -23,11 +23,11 @@ {% block stylesheets %} {% if v %} - + {% if v.agendaposter %}{% elif v.css %}{% endif %} {% else %} - + {% endif %} {% endblock %} From 82461284ea7ba8c51aa50af200c4bb09f0047a46 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Wed, 8 Dec 2021 19:29:11 +0200 Subject: [PATCH 04/30] fdsfsd --- files/__main__.py | 2 +- files/routes/posts.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/files/__main__.py b/files/__main__.py index fb6c446131..8a259aa29d 100644 --- a/files/__main__.py +++ b/files/__main__.py @@ -124,8 +124,8 @@ def teardown_request(error): def after_request(response): response.headers.add("Strict-Transport-Security", "max-age=31536000") - response.headers.add("Referrer-Policy", "same-origin") response.headers.add("X-Frame-Options", "deny") + response.headers.add("Content-Security-Policy", "script-src 'self';") return response diff --git a/files/routes/posts.py b/files/routes/posts.py index 99ebea6933..518ea6f132 100644 --- a/files/routes/posts.py +++ b/files/routes/posts.py @@ -1070,7 +1070,7 @@ def submit_post(v): if "rama" in request.host or "pcm" in request.host: if v.id == CARP_ID: if random.random() < 0.02: body = "i love you carp" - else: body = "![](/assets/images/emojis/fuckoffcarp.webp)" + else: body = ":#marseyfuckoffcarp:" elif v.id == LAWLZ_ID: if random.random() < 0.5: body = "wow, this lawlzpost sucks!" else: body = "wow, a good lawlzpost for once!" From c633a69fd4f5b1a248b39a5603db16936fc74585 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Wed, 8 Dec 2021 19:38:34 +0200 Subject: [PATCH 05/30] fdsfsd --- files/__main__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/__main__.py b/files/__main__.py index 8a259aa29d..6c5214dfe3 100644 --- a/files/__main__.py +++ b/files/__main__.py @@ -125,7 +125,7 @@ def after_request(response): response.headers.add("Strict-Transport-Security", "max-age=31536000") response.headers.add("X-Frame-Options", "deny") - response.headers.add("Content-Security-Policy", "script-src 'self';") + response.headers.add("Content-Security-Policy", "script-src 'self' *.cloudflare.com;") return response From bba10ed66b2eb0eecfa1e46e7badf4d0fdc32aa4 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Wed, 8 Dec 2021 19:40:36 +0200 Subject: [PATCH 06/30] fdsfsd --- files/__main__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/__main__.py b/files/__main__.py index 6c5214dfe3..fd89385968 100644 --- a/files/__main__.py +++ b/files/__main__.py @@ -125,7 +125,7 @@ def after_request(response): response.headers.add("Strict-Transport-Security", "max-age=31536000") response.headers.add("X-Frame-Options", "deny") - response.headers.add("Content-Security-Policy", "script-src 'self' *.cloudflare.com;") + response.headers.add("Content-Security-Policy", "script-src 'self' ajax.cloudflare.com 'unsafe-inline' static.cloudflareinsights.com; connect-src cloudflareinsights.co;") return response From ee4c6297d500a6513326b8aec0b3483fb656c977 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Wed, 8 Dec 2021 19:45:42 +0200 Subject: [PATCH 07/30] fsdfsd --- files/__main__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/__main__.py b/files/__main__.py index fd89385968..22723a9324 100644 --- a/files/__main__.py +++ b/files/__main__.py @@ -125,7 +125,7 @@ def after_request(response): response.headers.add("Strict-Transport-Security", "max-age=31536000") response.headers.add("X-Frame-Options", "deny") - response.headers.add("Content-Security-Policy", "script-src 'self' ajax.cloudflare.com 'unsafe-inline' static.cloudflareinsights.com; connect-src cloudflareinsights.co;") + response.headers.add("Content-Security-Policy", "script-src 'self' 'unsafe-inline' 'unsafe-eval' ajax.cloudflare.com static.cloudflareinsights.com; connect-src 'self' cloudflareinsights.co;") return response From 7fbde73d174387e3c71fdec637dfdd3b807bf752 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Wed, 8 Dec 2021 19:50:39 +0200 Subject: [PATCH 08/30] dfsdsffds --- files/__main__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/__main__.py b/files/__main__.py index 22723a9324..10b0203a35 100644 --- a/files/__main__.py +++ b/files/__main__.py @@ -125,7 +125,7 @@ def after_request(response): response.headers.add("Strict-Transport-Security", "max-age=31536000") response.headers.add("X-Frame-Options", "deny") - response.headers.add("Content-Security-Policy", "script-src 'self' 'unsafe-inline' 'unsafe-eval' ajax.cloudflare.com static.cloudflareinsights.com; connect-src 'self' cloudflareinsights.co;") + response.headers.add("Content-Security-Policy", "script-src 'self' 'unsafe-inline' 'unsafe-eval' ajax.cloudflare.com static.cloudflareinsights.com; connect-src 'self' cloudflareinsights.co *.pusher.com;") return response From dd726be4c9601ccdf2f530117631675465739cd2 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Wed, 8 Dec 2021 20:06:07 +0200 Subject: [PATCH 09/30] fds --- files/helpers/sanitize.py | 2 +- files/templates/formatting.html | 2 +- files/templates/submission.html | 2 +- files/templates/submission_listing.html | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/files/helpers/sanitize.py b/files/helpers/sanitize.py index ead7cf741c..49524a702a 100644 --- a/files/helpers/sanitize.py +++ b/files/helpers/sanitize.py @@ -229,7 +229,7 @@ def sanitize(sanitized, noimages=False): sanitized = sanitized.replace(replacing, htmlsource) for i in re.finditer('

(https:.*?\.mp4)

', sanitized): - sanitized = sanitized.replace(i.group(0), f'

') + sanitized = sanitized.replace(i.group(0), f'

') for rd in ["https://reddit.com/", "https://new.reddit.com/", "https://www.reddit.com/", "https://redd.it/"]: sanitized = sanitized.replace(rd, "https://old.reddit.com/") diff --git a/files/templates/formatting.html b/files/templates/formatting.html index 2acbd8dd98..ebce280cc5 100644 --- a/files/templates/formatting.html +++ b/files/templates/formatting.html @@ -59,7 +59,7 @@ You can use Markdown formatting. Videos [{{'SITE_NAME' | app_config}}]({{request.host_url}}) - + diff --git a/files/templates/submission.html b/files/templates/submission.html index dc7bc0005f..8d3a7a7943 100644 --- a/files/templates/submission.html +++ b/files/templates/submission.html @@ -454,7 +454,7 @@ {% elif p.url and p.url.lower().endswith('.mp4') %}

-
diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html index 3c15572cdd..8fb747becb 100644 --- a/files/templates/submission_listing.html +++ b/files/templates/submission_listing.html @@ -487,7 +487,7 @@ {% if p.url and p.url.lower().endswith('.mp4') %}
-
From c913516ec44035f778d4cb303760aa8f678281ab Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Wed, 8 Dec 2021 20:27:05 +0200 Subject: [PATCH 10/30] fsdfds --- files/__main__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/__main__.py b/files/__main__.py index 10b0203a35..17185bdb42 100644 --- a/files/__main__.py +++ b/files/__main__.py @@ -125,7 +125,7 @@ def after_request(response): response.headers.add("Strict-Transport-Security", "max-age=31536000") response.headers.add("X-Frame-Options", "deny") - response.headers.add("Content-Security-Policy", "script-src 'self' 'unsafe-inline' 'unsafe-eval' ajax.cloudflare.com static.cloudflareinsights.com; connect-src 'self' cloudflareinsights.co *.pusher.com;") + response.headers.add("Content-Security-Policy", "script-src 'self' 'unsafe-inline' 'unsafe-eval' ajax.cloudflare.com static.cloudflareinsights.com; connect-src 'self' cloudflareinsights.co *.pusher.com;object-src 'none';") return response From 99c560fb19d9d4425a49569176cf45610eb0b9cf Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Wed, 8 Dec 2021 20:44:37 +0200 Subject: [PATCH 11/30] fsddfssfd --- files/helpers/sanitize.py | 16 ++++++++-------- files/templates/comments.html | 2 +- files/templates/default.html | 2 +- files/templates/formatting.html | 8 ++++---- files/templates/submission.html | 2 +- files/templates/submit.html | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/files/helpers/sanitize.py b/files/helpers/sanitize.py index 49524a702a..ee09b768d7 100644 --- a/files/helpers/sanitize.py +++ b/files/helpers/sanitize.py @@ -172,16 +172,16 @@ def sanitize(sanitized, noimages=False): for i in re.finditer('(?', sanitized) + sanitized = re.sub(f'(?', sanitized) if emoji in session["favorite_emojis"]: session["favorite_emojis"][emoji] += 1 else: session["favorite_emojis"][emoji] = 1 elif path.isfile(f'./files/assets/images/emojis/{emoji}.webp'): - sanitized = re.sub(f'(?', sanitized) + sanitized = re.sub(f'(?', sanitized) if emoji in session["favorite_emojis"]: session["favorite_emojis"][emoji] += 1 else: session["favorite_emojis"][emoji] = 1 @@ -252,10 +252,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) + title = re.sub(f'(?', title) elif path.isfile(f'./files/assets/images/emojis/{emoji}.webp'): - title = re.sub(f'(?', title) + title = re.sub(f'(?', title) if len(title) > 1500: abort(400) else: return title \ No newline at end of file diff --git a/files/templates/comments.html b/files/templates/comments.html index 5b86c40bf6..934fb7abb5 100644 --- a/files/templates/comments.html +++ b/files/templates/comments.html @@ -749,7 +749,7 @@ {% if v %} - + {% endif %} diff --git a/files/templates/default.html b/files/templates/default.html index f12641de0f..5e04e0eb1c 100644 --- a/files/templates/default.html +++ b/files/templates/default.html @@ -45,7 +45,7 @@ - + diff --git a/files/templates/formatting.html b/files/templates/formatting.html index ebce280cc5..2fae3cbfa5 100644 --- a/files/templates/formatting.html +++ b/files/templates/formatting.html @@ -65,22 +65,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/submission.html b/files/templates/submission.html index 8d3a7a7943..8890f36f27 100644 --- a/files/templates/submission.html +++ b/files/templates/submission.html @@ -870,7 +870,7 @@ {% if not p.comment_count %} {% if v %} - + {% include "award_modal.html" %} {% include "emoji_modal.html" %} {% include "gif_modal.html" %} diff --git a/files/templates/submit.html b/files/templates/submit.html index 5d5cd39288..d0f0396342 100644 --- a/files/templates/submit.html +++ b/files/templates/submit.html @@ -175,7 +175,7 @@ - + {% include "emoji_modal.html" %} From c0977ef0209d81171ea0c1bdccf4c0b2be031af6 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Wed, 8 Dec 2021 20:45:12 +0200 Subject: [PATCH 12/30] sdfsfdsdf --- 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 ++-- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/files/templates/authforms.html b/files/templates/authforms.html index b9e65377f1..815dac53a4 100644 --- a/files/templates/authforms.html +++ b/files/templates/authforms.html @@ -13,11 +13,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 5e04e0eb1c..361786594e 100644 --- a/files/templates/default.html +++ b/files/templates/default.html @@ -5,12 +5,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 59ae8ffc61..8e942af782 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 7c80270a39..77768331ba 100644 --- a/files/templates/login_2fa.html +++ b/files/templates/login_2fa.html @@ -12,7 +12,7 @@ 2-Step Login - {{'SITE_NAME' | app_config}} - + diff --git a/files/templates/settings.html b/files/templates/settings.html index c1837701c1..5c0fd1fb17 100644 --- a/files/templates/settings.html +++ b/files/templates/settings.html @@ -31,7 +31,7 @@ - + {% if v.agendaposter %}{% elif v.css %}{% endif %} diff --git a/files/templates/settings2.html b/files/templates/settings2.html index b0ee435ca3..4e61d33671 100644 --- a/files/templates/settings2.html +++ b/files/templates/settings2.html @@ -36,10 +36,10 @@ {% if v %} - + {% else %} - + {% endif %} diff --git a/files/templates/sign_up.html b/files/templates/sign_up.html index 8f36255ce6..e1f242a248 100644 --- a/files/templates/sign_up.html +++ b/files/templates/sign_up.html @@ -28,7 +28,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 e72376ccf2..ab08fe2e3d 100644 --- a/files/templates/sign_up_failed_ref.html +++ b/files/templates/sign_up_failed_ref.html @@ -29,7 +29,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 d0f0396342..af3e15d245 100644 --- a/files/templates/submit.html +++ b/files/templates/submit.html @@ -23,11 +23,11 @@ {% block stylesheets %} {% if v %} - + {% if v.agendaposter %}{% elif v.css %}{% endif %} {% else %} - + {% endif %} {% endblock %} From d590879b2748c54d1701093db058f25b4b9a2cc3 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Wed, 8 Dec 2021 20:57:52 +0200 Subject: [PATCH 13/30] sfdfds --- files/templates/formatting.html | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/files/templates/formatting.html b/files/templates/formatting.html index 2fae3cbfa5..ff1d3cb500 100644 --- a/files/templates/formatting.html +++ b/files/templates/formatting.html @@ -57,11 +57,15 @@ You can use Markdown formatting. - Videos - [{{'SITE_NAME' | app_config}}]({{request.host_url}}) + Youtube Videos + https://youtube.com/watch?v=3Hecr51ByE4 + + + + Video Files + https://files.catbox.moe/v4om92.mp4 - Emojis :marseylove: From 19a33d9360749bcdc671db8faa67fbc28b627b44 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Wed, 8 Dec 2021 20:59:35 +0200 Subject: [PATCH 14/30] sfdsfd --- files/templates/formatting.html | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/files/templates/formatting.html b/files/templates/formatting.html index ff1d3cb500..65e6ebb49d 100644 --- a/files/templates/formatting.html +++ b/files/templates/formatting.html @@ -11,7 +11,7 @@

Markdown Formatting

-You can use Markdown formatting. +You can use Markdown formatting: 
 
@@ -151,9 +151,13 @@ You can use Markdown formatting.
 
 
HTML Formatting

 
-And we allow custom HTML in most places.
+And we allow custom HTML in most places:
 
-Allowed tags:
+
+
+

+
+
Allowed tags:

 
 

From e1a5cc2cac567943dfb1e36c4cf318bc6baf1b7d Mon Sep 17 00:00:00 2001
From: Aevann1 
Date: Wed, 8 Dec 2021 21:00:30 +0200
Subject: [PATCH 15/30] fdsdsf

---
 files/templates/formatting.html | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/files/templates/formatting.html b/files/templates/formatting.html
index 65e6ebb49d..a7f9c8cee8 100644
--- a/files/templates/formatting.html
+++ b/files/templates/formatting.html
@@ -157,7 +157,7 @@ And we allow custom HTML in most places:
 
 
 
-
Allowed tags:

+
Allowed tags:

 
 

 	

@@ -168,6 +168,15 @@ And we allow custom HTML in most places:
 		
+		
+			
+			
+			
+		
@@ -439,19 +448,10 @@ line breaks
 				
-		
-			
-			
-			
-		

 	
 	
 	
Span
+				My mother has <span style="color:blue">blue</span> eyes.
+			
+				My mother has blue eyes.
+			

 		

 			Bold
 			This will be <b>bold</b>
 			
 		
Span
-				My mother has <span style="color:blue">blue</span> eyes.
-			
-				My mother has blue eyes.
-			

 	
 

 
-
Allowed Attributes

+
Allowed Attributes

 
 
@@ -493,7 +493,7 @@ line breaks
 	

 	
 

 
-
Allowed Styles

+
Allowed Styles

 
 

From 430116ad10b5b39c1ed264d52ef20b4782e24742 Mon Sep 17 00:00:00 2001
From: Aevann1 
Date: Wed, 8 Dec 2021 21:00:55 +0200
Subject: [PATCH 16/30] dfsfsd

---
 files/templates/formatting.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/templates/formatting.html b/files/templates/formatting.html
index a7f9c8cee8..4ff3a9c4bc 100644
--- a/files/templates/formatting.html
+++ b/files/templates/formatting.html
@@ -157,7 +157,7 @@ And we allow custom HTML in most places:
 
 
 
-
Allowed tags:

+
Allowed Tags

 
 

 	


From 198960c3764880be5c716b91fea345a4345cd7ac Mon Sep 17 00:00:00 2001
From: Aevann1 
Date: Wed, 8 Dec 2021 21:10:47 +0200
Subject: [PATCH 17/30] fdsfdsfsd

---
 files/routes/posts.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/routes/posts.py b/files/routes/posts.py
index 518ea6f132..62ee3e66db 100644
--- a/files/routes/posts.py
+++ b/files/routes/posts.py
@@ -114,7 +114,7 @@ def post_id(pid, anything=None, v=None):
 
 	post = get_post(pid, v=v)
 
-	if post.club and not (v and (v.paid_dues or v.id == post.author_id)) or post.private and not (v and v.id == post.author_id): abort(403)
+	if v.admin_level < 2 and post.club and not (v and (v.paid_dues or v.id == post.author_id)) or post.private and not (v and v.id == post.author_id): abort(403)
 
 	if v:
 		votes = g.db.query(CommentVote).filter_by(user_id=v.id).subquery()

From b867be54d19694ff97635de0e4df91915b9878ae Mon Sep 17 00:00:00 2001
From: Aevann1 
Date: Wed, 8 Dec 2021 21:11:02 +0200
Subject: [PATCH 18/30] fsfsd

---
 files/routes/posts.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/routes/posts.py b/files/routes/posts.py
index 62ee3e66db..522a3a182a 100644
--- a/files/routes/posts.py
+++ b/files/routes/posts.py
@@ -114,7 +114,7 @@ def post_id(pid, anything=None, v=None):
 
 	post = get_post(pid, v=v)
 
-	if v.admin_level < 2 and post.club and not (v and (v.paid_dues or v.id == post.author_id)) or post.private and not (v and v.id == post.author_id): abort(403)
+	if not (v and v.admin_level > 1) and post.club and not (v and (v.paid_dues or v.id == post.author_id)) or post.private and not (v and v.id == post.author_id): abort(403)
 
 	if v:
 		votes = g.db.query(CommentVote).filter_by(user_id=v.id).subquery()

From af40392f930a4ca56a0a3a334332e67e74999127 Mon Sep 17 00:00:00 2001
From: Aevann1 
Date: Wed, 8 Dec 2021 21:22:01 +0200
Subject: [PATCH 19/30] fdsfsd

---
 files/templates/formatting.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/files/templates/formatting.html b/files/templates/formatting.html
index 4ff3a9c4bc..05ef47ddb4 100644
--- a/files/templates/formatting.html
+++ b/files/templates/formatting.html
@@ -21,8 +21,8 @@ You can use Markdown formatting:
 	
-			
-			
+			
+			
@@ -163,8 +163,8 @@ And we allow custom HTML in most places:
 	
-			
-			
+			
+			

From 157b0f79dfafa1ac4f7e2b1059083677357b920f Mon Sep 17 00:00:00 2001
From: Aevann1 
Date: Wed, 8 Dec 2021 21:28:36 +0200
Subject: [PATCH 20/30] fdsfsdfds

---
 files/templates/comments.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/templates/comments.html b/files/templates/comments.html
index 934fb7abb5..1b2f132923 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -211,7 +211,7 @@
 				{{c.author.username}}
 				{% if c.author.customtitle %}  {% if c.author.quadrant %}{% endif %}{{c.author.customtitle | safe}}{% endif %}
 
-				{% if c.parent_comment_id and not standalone and level<=7 %}{{ c.parent_comment.author.username }}{% endif %}
+				{% if c.parent_comment_id and not standalone and level<10 %}{{ c.parent_comment.author.username }}{% endif %}
 
 				 {{c.age_string}}
 				{% if c.edited_utc %}

From ca79851d33bb9fafddbb34f04858897f02270cb4 Mon Sep 17 00:00:00 2001
From: Aevann1 
Date: Wed, 8 Dec 2021 21:30:49 +0200
Subject: [PATCH 21/30] dfsfsd

---
 files/templates/comments.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/templates/comments.html b/files/templates/comments.html
index 1b2f132923..e7f1e80827 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -211,7 +211,7 @@
 				{{c.author.username}}
 				{% if c.author.customtitle %}  {% if c.author.quadrant %}{% endif %}{{c.author.customtitle | safe}}{% endif %}
 
-				{% if c.parent_comment_id and not standalone and level<10 %}{{ c.parent_comment.author.username }}{% endif %}
+				{% if c.parent_comment_id and not standalone and level<=10 %}{{ c.parent_comment.author.username }}{% endif %}
 
 				 {{c.age_string}}
 				{% if c.edited_utc %}

From 5ff0f39771ee3351277a797e91ffb505ac795173 Mon Sep 17 00:00:00 2001
From: Aevann1 
Date: Wed, 8 Dec 2021 21:31:19 +0200
Subject: [PATCH 22/30] fdssfd

---
 files/templates/comments.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/templates/comments.html b/files/templates/comments.html
index e7f1e80827..3648992bee 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -211,7 +211,7 @@
 				{{c.author.username}}
 				{% if c.author.customtitle %}  {% if c.author.quadrant %}{% endif %}{{c.author.customtitle | safe}}{% endif %}
 
-				{% if c.parent_comment_id and not standalone and level<=10 %}{{ c.parent_comment.author.username }}{% endif %}
+				{% if c.parent_comment_id and not standalone and level!=11 %}{{ c.parent_comment.author.username }}{% endif %}
 
 				 {{c.age_string}}
 				{% if c.edited_utc %}

From c3be63ec1300191d21c5c2d7ab19ac765ff53f70 Mon Sep 17 00:00:00 2001
From: Aevann1 
Date: Wed, 8 Dec 2021 21:33:46 +0200
Subject: [PATCH 23/30] fsdfds

---
 files/templates/comments.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/templates/comments.html b/files/templates/comments.html
index 3648992bee..1000ae5107 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -211,7 +211,7 @@
 				{{c.author.username}}
 				{% if c.author.customtitle %}  {% if c.author.quadrant %}{% endif %}{{c.author.customtitle | safe}}{% endif %}
 
-				{% if c.parent_comment_id and not standalone and level!=11 %}{{ c.parent_comment.author.username }}{% endif %}
+				{% if c.parent_comment_id and not standalone and (level<11 or level%10!==1) %}{{ c.parent_comment.author.username }}{% endif %}
 
 				 {{c.age_string}}
 				{% if c.edited_utc %}

From ce878ed1348b119a20e1eb936724a35b2f2ee9a6 Mon Sep 17 00:00:00 2001
From: Aevann1 
Date: Wed, 8 Dec 2021 21:34:57 +0200
Subject: [PATCH 24/30] fdsfds

---
 files/templates/comments.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/templates/comments.html b/files/templates/comments.html
index 1000ae5107..696292b16c 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -211,7 +211,7 @@
 				{{c.author.username}}
 				{% if c.author.customtitle %}  {% if c.author.quadrant %}{% endif %}{{c.author.customtitle | safe}}{% endif %}
 
-				{% if c.parent_comment_id and not standalone and (level<11 or level%10!==1) %}{{ c.parent_comment.author.username }}{% endif %}
+				{% if c.parent_comment_id and not standalone and (c.level<11 or c.level%10!==1) %}{{ c.parent_comment.author.username }}{% endif %}
 
 				 {{c.age_string}}
 				{% if c.edited_utc %}

From a1d08c356f948c3cf4332b4a8088209ae6cdddc1 Mon Sep 17 00:00:00 2001
From: Aevann1 
Date: Wed, 8 Dec 2021 21:35:19 +0200
Subject: [PATCH 25/30] fsddsf

---
 files/templates/comments.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/templates/comments.html b/files/templates/comments.html
index 696292b16c..15f0f1fb86 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -211,7 +211,7 @@
 				{{c.author.username}}
 				{% if c.author.customtitle %}  {% if c.author.quadrant %}{% endif %}{{c.author.customtitle | safe}}{% endif %}
 
-				{% if c.parent_comment_id and not standalone and (c.level<11 or c.level%10!==1) %}{{ c.parent_comment.author.username }}{% endif %}
+				{% if c.parent_comment_id and not standalone and (c.level<11 or c.level%10!=1) %}{{ c.parent_comment.author.username }}{% endif %}
 
 				 {{c.age_string}}
 				{% if c.edited_utc %}

From b5511892eee3497fb6aad8daca3f672f0b227138 Mon Sep 17 00:00:00 2001
From: Aevann1 
Date: Wed, 8 Dec 2021 21:39:06 +0200
Subject: [PATCH 26/30] dfsfds

---
 files/templates/comments.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/templates/comments.html b/files/templates/comments.html
index 15f0f1fb86..22d8286b6d 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -211,7 +211,7 @@
 				{{c.author.username}}
 				{% if c.author.customtitle %}  {% if c.author.quadrant %}{% endif %}{{c.author.customtitle | safe}}{% endif %}
 
-				{% if c.parent_comment_id and not standalone and (c.level<11 or c.level%10!=1) %}{{ c.parent_comment.author.username }}{% endif %}
+				{% if c.parent_comment_id and not standalone and level != 1 %}{{ c.parent_comment.author.username }}{% endif %}
 
 				 {{c.age_string}}
 				{% if c.edited_utc %}

From 8a4750a0b6316a2aa6181420b96fb7bf9c764bed Mon Sep 17 00:00:00 2001
From: Aevann1 
Date: Wed, 8 Dec 2021 21:53:48 +0200
Subject: [PATCH 27/30] fsdfds

---
 files/templates/formatting.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/files/templates/formatting.html b/files/templates/formatting.html
index 05ef47ddb4..07f055ef73 100644
--- a/files/templates/formatting.html
+++ b/files/templates/formatting.html
@@ -442,10 +442,10 @@ line breaks
 		

From 27e397b830b6b7814bdf38a041bb8d48bc2570a0 Mon Sep 17 00:00:00 2001
From: Aevann1 
Date: Wed, 8 Dec 2021 21:56:05 +0200
Subject: [PATCH 28/30] fdsfds

---
 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 361786594e..e57564ee3b 100644
--- a/files/templates/default.html
+++ b/files/templates/default.html
@@ -355,7 +355,7 @@
 	
 {% endif %}
 
-
+
 
 
 

From d2ebf8b1115b33a07940d36ea94c1924fa26291d Mon Sep 17 00:00:00 2001
From: Aevann1 
Date: Thu, 9 Dec 2021 16:07:37 +0200
Subject: [PATCH 29/30] fdsfds

---
 files/__main__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/__main__.py b/files/__main__.py
index 17185bdb42..5b02eac5f4 100644
--- a/files/__main__.py
+++ b/files/__main__.py
@@ -125,7 +125,7 @@ def after_request(response):
 
 	response.headers.add("Strict-Transport-Security", "max-age=31536000")
 	response.headers.add("X-Frame-Options", "deny")
-	response.headers.add("Content-Security-Policy", "script-src 'self' 'unsafe-inline' 'unsafe-eval' ajax.cloudflare.com static.cloudflareinsights.com; connect-src 'self' cloudflareinsights.co *.pusher.com;object-src 'none';")
+	response.headers.add("Content-Security-Policy", "script-src 'self' 'unsafe-inline' 'unsafe-eval'; connect-src 'self' *.pusher.com; object-src 'none';")
 	return response
 
 

From 7b81aef8aa7ba940066ae360d99fb38de9084cf4 Mon Sep 17 00:00:00 2001
From: Aevann1 
Date: Thu, 9 Dec 2021 16:32:46 +0200
Subject: [PATCH 30/30] fdsfd

---
 files/templates/admin/image_posts.html    |  21 --
 files/templates/admin/reported_posts.html |  21 --
 files/templates/ban_modal.html            |  25 +-
 files/templates/comments.html             |  10 +-
 files/templates/default.html              |  67 +---
 files/templates/delete_post_modal.html    |  25 +-
 files/templates/expanded_image_modal.html |   9 -
 files/templates/followers.html            |   8 +-
 files/templates/following.html            |   8 +-
 files/templates/header.html               |   5 -
 files/templates/home.html                 |  52 +--
 files/templates/log.html                  |  10 +-
 files/templates/settings.html             |  16 +-
 files/templates/settings2.html            |   4 -
 files/templates/settings_blocks.html      |  37 +-
 files/templates/settings_css.html         |  10 -
 files/templates/settings_profile.html     |  18 +-
 files/templates/settings_security.html    | 389 +++++++++++-----------
 files/templates/submission.html           |  55 +--
 files/templates/submission_listing.html   |   2 +-
 files/templates/userpage_blocked.html     |  21 --
 files/templates/userpage_blocking.html    |  21 --
 files/templates/userpage_reserved.html    |  21 --
 23 files changed, 211 insertions(+), 644 deletions(-)

diff --git a/files/templates/admin/image_posts.html b/files/templates/admin/image_posts.html
index 3c469e26a6..3052d265a3 100644
--- a/files/templates/admin/image_posts.html
+++ b/files/templates/admin/image_posts.html
@@ -11,27 +11,6 @@
 {% block postNav %}{% endblock %}
 
 {% block fixedMobileBarJS %}
-
 {% endblock %}
 
 {% block title %}
diff --git a/files/templates/admin/reported_posts.html b/files/templates/admin/reported_posts.html
index d0716b8906..9439f78a0d 100644
--- a/files/templates/admin/reported_posts.html
+++ b/files/templates/admin/reported_posts.html
@@ -39,27 +39,6 @@
 
 
 {% block fixedMobileBarJS %}
-
 {% endblock %}
 
 {% block title %}
diff --git a/files/templates/ban_modal.html b/files/templates/ban_modal.html
index 6c0e2e8d9e..58dbfae899 100644
--- a/files/templates/ban_modal.html
+++ b/files/templates/ban_modal.html
@@ -1,28 +1,5 @@
 
-
+
 
 

 	
 		

 			NameTypeDisplays asWhat you typeWhat gets displayed
 		

 	
 	
 		

 			NameTypeDisplays asWhat you typeWhat gets displayed
 		

 	
 	

 			Images
 			
-				<img src="https://i.imgur.com/Lf6dfPO.jpg" width="200">
+				<img src="https://i.imgur.com/SwVuagI_d.webp" width="200">
 			
 			
-				
+