From c61375288f2e15f474cbbdcc56d3d93e5009a4de Mon Sep 17 00:00:00 2001 From: TLSM Date: Tue, 14 Jun 2022 03:48:02 -0400 Subject: [PATCH 03/21] Content: add TLD to sanitize. --- files/helpers/sanitize.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/helpers/sanitize.py b/files/helpers/sanitize.py index b1604d2f5c..bf5ca2504d 100644 --- a/files/helpers/sanitize.py +++ b/files/helpers/sanitize.py @@ -32,7 +32,7 @@ TLDS = ( # Original gTLDs and ccTLDs 'vu','wf','ws','xn','xxx','ye','yt','yu','za','zm','zw', # New gTLDs 'app','cleaning','club','florist','fun','gay','lgbt','life','lol', - 'moe','mom','monster','pics','win','wtf','xyz', + 'moe','mom','monster','pics','pub','win','wtf','xyz', ) allowed_tags = ('b','blockquote','br','code','del','em','h1','h2','h3','h4','h5','h6','hr','i', From 3301e238d6410aabdd8a3e3c65b459f3a38a5409 Mon Sep 17 00:00:00 2001 From: TLSM Date: Tue, 14 Jun 2022 14:37:45 -0400 Subject: [PATCH 06/21] Content: alphabet emoji, christian list. --- files/helpers/const.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/files/helpers/const.py b/files/helpers/const.py index c8e6eeaf03..3dbc37693a 100644 --- a/files/helpers/const.py +++ b/files/helpers/const.py @@ -853,7 +853,10 @@ WORDLE_LIST = ('aaron','about','above','abuse','acids','acres','actor','acute',' dues = int(environ.get("DUES").strip()) -christian_emojis = (':#marseyjesus:',':#marseyimmaculate:',':#marseymothermary:',':#marseyfatherjoseph:',':#gigachadorthodox:',':#marseyorthodox:',':#marseyorthodoxpat:') +christian_emojis = [':#marseyjesus:',':#marseyimmaculate:',':#marseymothermary:', + ':#marseyfatherjoseph:',':#gigachadorthodox:',':#marseyorthodox:',':#marseyorthodoxpat:', + ':#marseycrucified:',':#chadjesus:',':#marseyandjesus:',':#marseyjesus2:', + ':#marseyorthodoxsmug:',':#marseypastor:',':#marseypope:',] db = db_session() marseys_const = [x[0] for x in db.query(Marsey.name).filter(Marsey.name!='chudsey').all()] From 1e26fb3d79265161a8be8111d165f3483c2ed892 Mon Sep 17 00:00:00 2001 From: TLSM Date: Tue, 14 Jun 2022 18:04:22 -0400 Subject: [PATCH 10/21] Hide self-deleted posts from other users. --- files/templates/submission.html | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/files/templates/submission.html b/files/templates/submission.html index 626f76acd7..1d440b06a3 100644 --- a/files/templates/submission.html +++ b/files/templates/submission.html @@ -11,6 +11,8 @@ {% set voted=-2 %} {% endif %} +{% set v_forbid_deleted = (p.deleted_utc != 0) and not (v and v.admin_level >= 2) and not (v and v.id == p.author_id) %} + {% block title %}