From fde2d5ca11458a7eef6d628c9fac0b8e6a29e4c1 Mon Sep 17 00:00:00 2001 From: TLSM Date: Sat, 9 Jul 2022 06:09:33 -0400 Subject: [PATCH 1/4] LGB: Use static default pfp. --- files/helpers/const.py | 36 ++++++++++++++++++++---------------- files/routes/login.py | 4 +++- 2 files changed, 23 insertions(+), 17 deletions(-) diff --git a/files/helpers/const.py b/files/helpers/const.py index 2ee72c36a1..c266d42c02 100644 --- a/files/helpers/const.py +++ b/files/helpers/const.py @@ -139,12 +139,6 @@ AGENDAPOSTER_MSG_HTML = """

Hi Date: Sat, 9 Jul 2022 06:38:45 -0400 Subject: [PATCH 2/4] LGB: Add directory. --- files/__main__.py | 1 + files/templates/megathread_index.html | 49 ++++++++++++++++++++++-- files/templates/sidebar_LGBDropTheT.html | 4 ++ files/templates/util/assetcache.html | 2 +- 4 files changed, 51 insertions(+), 5 deletions(-) diff --git a/files/__main__.py b/files/__main__.py index 03ec28833e..298625f508 100644 --- a/files/__main__.py +++ b/files/__main__.py @@ -21,6 +21,7 @@ app = Flask(__name__, template_folder='templates') app.url_map.strict_slashes = False app.jinja_env.cache = {} app.jinja_env.auto_reload = True +app.jinja_env.add_extension('jinja2.ext.do') faulthandler.enable() app.config['SECRET_KEY'] = environ.get('MASTER_KEY') diff --git a/files/templates/megathread_index.html b/files/templates/megathread_index.html index 40132e3bcc..7ca31794e4 100644 --- a/files/templates/megathread_index.html +++ b/files/templates/megathread_index.html @@ -2,8 +2,10 @@ {# Title (~25char max), Description (~80char max), Icon (fa-foo-bar), Color (#ff0000), URL (/post/12345/) #} -{%- -set MEGATHREAD_INDEX = [ +{%- set MEGATHREAD_INDEX = [] -%} + +{%- if SITE_NAME == 'rDrama' -%} +{%- do MEGATHREAD_INDEX.extend([ ( 'Bugs / Suggestions', 'Something broken? Improvements?', @@ -46,8 +48,47 @@ set MEGATHREAD_INDEX = [ 'fa-dice-six', '#c9d1d9', '/post/39413', ), -] --%} +])-%} +{%- elif SITE_NAME == 'LGBDropTheT' -%} +{%- do MEGATHREAD_INDEX.extend([ + ( + 'Rules & FAQs', + 'Commonly-Asked Questions', + 'fa-circle-info', '#4bc2ea', + '/kb/rulesfaqs', + ), + ( + 'Help & Support', + 'User Guides, Suggestions, Tech Issues', + 'fa-comment-question', '#70e572', + '/h/help_and_support', + ), + ( + 'Resources & Organizations', + 'LGB and "Drop The T" Support', + 'fa-sitemap', '#4bc2ea', + '/kb/resourcesorgs', + ), + ( + 'Artwork & Design Suggestions', + 'Emotes, Icons, Banners, and More', + 'fa-panorama', '#e9ef2f', + '/h/off_topic_social/post/40/artwork-design-suggestions-megathread', + ), + ( + 'Banned From / Censorship', + 'Megathread: Share Your Woes & Commiserate', + 'fa-ban', '#ed3d2d', + '/post/27/banned-from-and-censorship-megathread', + ), + ( + 'Gambling Mega-Thread', + 'Goomble without bothering people.', + 'fa-dice-six', '#c9d1d9', + '/h/off_topic_social/post/25/gambling-megathread', + ), +])-%} +{%- endif -%} {% block content %}

diff --git a/files/templates/sidebar_LGBDropTheT.html b/files/templates/sidebar_LGBDropTheT.html index ac939592d4..d32c12d1de 100644 --- a/files/templates/sidebar_LGBDropTheT.html +++ b/files/templates/sidebar_LGBDropTheT.html @@ -29,6 +29,10 @@ {% endif %} {{HOLE_NAME|upper}} MODS {% endif %} + + DIRECTORY + Resources | Site Help | Megathreads +

Rules

diff --git a/files/templates/util/assetcache.html b/files/templates/util/assetcache.html index f3dbb66863..6b76bfdda2 100644 --- a/files/templates/util/assetcache.html +++ b/files/templates/util/assetcache.html @@ -1,6 +1,6 @@ {%- set CACHE_VER = { - 'css/main.css': 382, + 'css/main.css': 383, 'css/4chan.css': 61, 'css/classic.css': 61, From 16125b419b0c93226cdfb302837f6051acdadff2 Mon Sep 17 00:00:00 2001 From: TLSM Date: Sat, 9 Jul 2022 06:50:53 -0400 Subject: [PATCH 3/4] LGB: Disable Snappy Marseys; Snappy empty behavior. --- files/helpers/actions.py | 17 +++++++---------- files/helpers/const.py | 8 ++++++++ 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/files/helpers/actions.py b/files/helpers/actions.py index fc33347ba2..f22c513ceb 100644 --- a/files/helpers/actions.py +++ b/files/helpers/actions.py @@ -7,13 +7,6 @@ from files.helpers.sanitize import * import random from urllib.parse import quote -if SITE_NAME == 'PCM': snappyquotes = [] -else: snappyquotes = [f':#{x}:' for x in marseys_const2] - -if path.exists(f'snappy_{SITE_NAME}.txt'): - with open(f'snappy_{SITE_NAME}.txt', "r", encoding="utf-8") as f: - snappyquotes += f.read().split("\n{[para]}\n") - def badge_grant(user, badge_id, description=None, url=None): assert user != None if user.has_badge(badge_id): @@ -49,8 +42,10 @@ def execute_snappy(post, v): elif v.id == LAWLZ_ID: if random.random() < 0.5: body = "wow, this lawlzpost sucks!" else: body = "wow, a good lawlzpost for once!" + elif len(SNAPPY_QUOTES) == 0: + body = "" else: - body = random.choice(snappyquotes).strip() + body = random.choice(SNAPPY_QUOTES).strip() if body.startswith('▼'): body = body[1:] vote = Vote(user_id=SNAPPY_ID, @@ -122,9 +117,11 @@ def execute_snappy(post, v): gevent.spawn(archiveorg, href) body = body.strip() - body_html = sanitize(body) + if len(body_html) == 0: + return + if len(body_html) < 40000: c = Comment(author_id=SNAPPY_ID, distinguish_level=6, @@ -156,4 +153,4 @@ def execute_snappy(post, v): c.top_comment_id = c.id post.comment_count += 1 - post.replies = [c] \ No newline at end of file + post.replies = [c] diff --git a/files/helpers/const.py b/files/helpers/const.py index c266d42c02..dde5c245cb 100644 --- a/files/helpers/const.py +++ b/files/helpers/const.py @@ -859,6 +859,14 @@ marseys_const = [x[0] for x in db.query(Marsey.name).filter(Marsey.name!='chudse marseys_const2 = marseys_const + ['chudsey','a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v','w','x','y','z','0','1','2','3','4','5','6','7','8','9','exclamationpoint','period','questionmark'] db.close() +SNAPPY_QUOTES = [] +if not SITE_NAME in ['PCM', 'LGBDropTheT']: + SNAPPY_QUOTES = [f':#{x}:' for x in marseys_const2] + +if path.exists(f'snappy_{SITE_NAME}.txt'): + with open(f'snappy_{SITE_NAME}.txt', "r", encoding="utf-8") as f: + SNAPPY_QUOTES += f.read().split("\n{[para]}\n") + YOUTUBE_KEY = environ.get("YOUTUBE_KEY", "").strip() ADMIGGERS = (37696,37697,37749,37833,37838,39413) From b47e9c7e18440ea74df20d9844f04c7eefde806b Mon Sep 17 00:00:00 2001 From: TLSM Date: Sat, 9 Jul 2022 07:03:23 -0400 Subject: [PATCH 4/4] Fix bot ID constants for CT, WPD, LGB. seed-db.sql in a8fe49f232ca was changed to no longer have a System user to support the notifications rework. The default IDs in const.py were updated to reflect this. However, CT/WPD/LGB had user IDs from the pre-rework SQL yet were using default IDs. The constants were updated to reflect the state on prod. Strangely, LGB has no user id #2. I have no idea why, but the constants accurately reflect this fact. --- files/helpers/const.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/files/helpers/const.py b/files/helpers/const.py index dde5c245cb..b22e1556ba 100644 --- a/files/helpers/const.py +++ b/files/helpers/const.py @@ -274,6 +274,11 @@ elif SITE == 'cringetopia.org': HOLE_COST = 10000 + AUTOJANNY_ID = 2 + SNAPPY_ID = 3 + LONGPOSTBOT_ID = 4 + ZOZBOT_ID = 5 + GIFT_NOTIF_ID = 18 CARP_ID = 18 AEVANN_ID = 9 @@ -302,6 +307,11 @@ elif SITE == 'watchpeopledie.co': HOLE_STYLE_FLAIR = True HOLE_REQUIRED = True + AUTOJANNY_ID = 2 + SNAPPY_ID = 3 + LONGPOSTBOT_ID = 4 + ZOZBOT_ID = 5 + GIFT_NOTIF_ID = 13 CARP_ID = 13 AEVANN_ID = 9 @@ -316,6 +326,11 @@ elif SITE == 'lgbdropthet.com': PROCOINS_ENABLED = False PFP_DEFAULT_MARSEY = False + AUTOJANNY_ID = 1 + SNAPPY_ID = 3 + LONGPOSTBOT_ID = 4 + ZOZBOT_ID = 5 + AEVANN_ID = 10 SNAKES_ID = 9