From d14aa7100bbbbde65a27fd4bd2d93b9402529ae5 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Tue, 16 Aug 2022 17:17:16 +0200 Subject: [PATCH 1/9] fix gumroad for WPD --- files/helpers/const.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/files/helpers/const.py b/files/helpers/const.py index e6e18ad9c..7274f3cc1 100644 --- a/files/helpers/const.py +++ b/files/helpers/const.py @@ -998,6 +998,11 @@ tiers={ "(JIDF Bankroller)": 6, "(Rich Bich)": 7, "(LlamaBean)": 1, + "(Tier 1)": 1, + "(Tier 2)": 2, + "(Tier 3)": 3, + "(Tier 4)": 4, + "(Tier 5)": 5, } DISCORD_WELCOME_CHANNEL = "846509313941700618" From acd892d681cc996090de6e77054c66f75434ff0f Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Tue, 16 Aug 2022 17:26:50 +0200 Subject: [PATCH 2/9] change WPD tier names --- files/helpers/const.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/files/helpers/const.py b/files/helpers/const.py index 7274f3cc1..71febfe41 100644 --- a/files/helpers/const.py +++ b/files/helpers/const.py @@ -998,11 +998,11 @@ tiers={ "(JIDF Bankroller)": 6, "(Rich Bich)": 7, "(LlamaBean)": 1, - "(Tier 1)": 1, - "(Tier 2)": 2, - "(Tier 3)": 3, - "(Tier 4)": 4, - "(Tier 5)": 5, + "(Victim)": 1, + "(Corpse)": 2, + "(Zombie)": 3, + "(Ghost)": 4, + "(Survivor)": 5, } DISCORD_WELCOME_CHANNEL = "846509313941700618" From 32e8f68ef527a724d5dba25f0a79eb38be44d92a Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Tue, 16 Aug 2022 18:05:16 +0200 Subject: [PATCH 3/9] show post links on desktop too --- files/templates/submission.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/templates/submission.html b/files/templates/submission.html index 9ab214087..50f5d0fe2 100644 --- a/files/templates/submission.html +++ b/files/templates/submission.html @@ -725,7 +725,7 @@ {% if p.realurl(v) %} {% if not p.embed_url and not p.is_image %} -
+
{{p.realurl(v)}}
From 88d16db94bb905e8a4faff010612d0c6cc250ff2 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Tue, 16 Aug 2022 18:14:10 +0200 Subject: [PATCH 4/9] reorder search UI to be more intuitive --- files/templates/search.html | 99 +++++++++++++++++++------------------ 1 file changed, 51 insertions(+), 48 deletions(-) diff --git a/files/templates/search.html b/files/templates/search.html index 5ba32f7b5..22a052868 100644 --- a/files/templates/search.html +++ b/files/templates/search.html @@ -6,10 +6,8 @@ Search for "{{query}}" - {{SITE_NAME}}" {% endblock %} -{% block PseudoSubmitForm %}{% endblock %} - -{% block navbar %} -
+{% block PseudoSubmitForm %} + @@ -17,50 +15,9 @@
- {% if not '/users' in request.path %} -
-
- -
- {% if t != "hour" %}Hour{% endif %} - {% if t != "day" %}Day{% endif %} - {% if t != "week" %}Week{% endif %} - {% if t != "month" %}Month{% endif %} - {% if t != "year" %}Year{% endif %} - {% if t != "all" %}All{% endif %} -
-
+{% endblock %} -
- -
- {% if sort != "top" %}Top{% endif %} - {% if sort != "bottom" %}Bottom{% endif %} - {% if sort != "new" %}New{% endif %} - {% if sort != "old" %}Old{% endif %} - {% if sort != "controversial" %}Controversial{% endif %} - {% if sort != "comments" and "/posts" in request.path %}Comments{% endif %} -
-
-
- {% endif %} +{% block navbar %} {% endblock %} {% block content %} @@ -77,7 +34,7 @@
    • -
    +
    {% if not request.path.startswith('/search/users') %} Advanced search parameters (with examples) @@ -97,6 +54,52 @@
    Showing {% block listinglength %}{{listing | length}}{% endblock %} of {{total}} result{{'s' if total != 1 else ''}} for

    {{query}}

    + {% if not '/users' in request.path %} +
    +
    + +
    + {% if t != "hour" %}Hour{% endif %} + {% if t != "day" %}Day{% endif %} + {% if t != "week" %}Week{% endif %} + {% if t != "month" %}Month{% endif %} + {% if t != "year" %}Year{% endif %} + {% if t != "all" %}All{% endif %} +
    +
    + +
    + +
    + {% if sort != "top" %}Top{% endif %} + {% if sort != "bottom" %}Bottom{% endif %} + {% if sort != "new" %}New{% endif %} + {% if sort != "old" %}Old{% endif %} + {% if sort != "controversial" %}Controversial{% endif %} + {% if sort != "comments" and "/posts" in request.path %}Comments{% endif %} +
    +
    +
    + {% endif %} + +
    From 026d023c43f2ccec8774f99b53c8f5beb46ba890 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Tue, 16 Aug 2022 18:16:04 +0200 Subject: [PATCH 5/9] filter 2 slurs from pronouns --- files/routes/settings.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/files/routes/settings.py b/files/routes/settings.py index e1a094452..77a84715f 100644 --- a/files/routes/settings.py +++ b/files/routes/settings.py @@ -900,6 +900,10 @@ def settings_pronouns_change(v): if not pronouns_regex.fullmatch(pronouns): return render_template("settings_profile.html", v=v, error="The pronouns you entered don't match the required format.") + bare_pronouns = pronouns.lower().replace('/', '') + if 'nig' in bare_pronouns: pronouns = 'BI/POC' + elif 'fag' in bare_pronouns: pronouns = 'cute/twink' + v.pronouns = pronouns g.db.add(v) From f52c20202f074eb63d37dc32530df2e14ca8a54b Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Tue, 16 Aug 2022 18:19:44 +0200 Subject: [PATCH 6/9] change chat default to 1 --- files/templates/header.html | 2 +- files/templates/mobile_navigation_bar.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/files/templates/header.html b/files/templates/header.html index 782bc09ef..08b50a389 100644 --- a/files/templates/header.html +++ b/files/templates/header.html @@ -169,7 +169,7 @@ - {{cache.get(ONLINE_STR) or 0}} + {{cache.get(ONLINE_STR) or 1}} diff --git a/files/templates/mobile_navigation_bar.html b/files/templates/mobile_navigation_bar.html index a5409f436..25ed4dd84 100644 --- a/files/templates/mobile_navigation_bar.html +++ b/files/templates/mobile_navigation_bar.html @@ -51,7 +51,7 @@