diff --git a/files/assets/images/emojis/marseyimposter.webp b/files/assets/images/emojis/marseyimposter.webp index ad5956854..1179b995b 100644 Binary files a/files/assets/images/emojis/marseyimposter.webp and b/files/assets/images/emojis/marseyimposter.webp differ diff --git a/files/classes/comment.py b/files/classes/comment.py index 1f002e883..3a804f051 100644 --- a/files/classes/comment.py +++ b/files/classes/comment.py @@ -21,8 +21,11 @@ def normalize_urls_runtime(body, v): if v and v.reddit != 'old.reddit.com': body = reddit_to_vreddit_regex.sub(rf'\1https://{v.reddit}/\2/', body) - if v.nitter: body = twitter_to_nitter_regex.sub(r'https://nitter.42l.fr/\1', body) - if v.imginn: body = body.replace('https://instagram.com/', 'https://imginn.com/') + if v.nitter: + body = body.replace('https://twitter.com/', 'https://nitter.42l.fr/') + body = body.replace('https://nitter.42l.fr/i/', 'https://twitter.com/i/') + if v.imginn: + body = body.replace('https://instagram.com/', 'https://imginn.com/') return body diff --git a/files/helpers/const.py b/files/helpers/const.py index e6e18ad9c..71febfe41 100644 --- a/files/helpers/const.py +++ b/files/helpers/const.py @@ -998,6 +998,11 @@ tiers={ "(JIDF Bankroller)": 6, "(Rich Bich)": 7, "(LlamaBean)": 1, + "(Victim)": 1, + "(Corpse)": 2, + "(Zombie)": 3, + "(Ghost)": 4, + "(Survivor)": 5, } DISCORD_WELCOME_CHANNEL = "846509313941700618" diff --git a/files/helpers/regex.py b/files/helpers/regex.py index 108ae0cf1..90849a231 100644 --- a/files/helpers/regex.py +++ b/files/helpers/regex.py @@ -90,8 +90,6 @@ greentext_regex = re.compile("(\n|^)>([^ >][^\n]*)", flags=re.A) ascii_only_regex = re.compile("[ -~]+", flags=re.A) -twitter_to_nitter_regex = re.compile("https:\/\/twitter.com\/(\w{2,15}(\/status\/\d+[^/]*)?)", flags=re.A) - reddit_to_vreddit_regex = re.compile('(^|>|")https:\/\/old.reddit.com\/(r|u)\/', flags=re.A) reddit_domain_regex = re.compile("(^|\s|\()https?:\/\/(reddit\.com|new\.reddit.com|www\.reddit.com|i\.reddit\.com|libredd\.it|teddit\.net)\/(r|u)\/", flags=re.A) 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) 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/megathread_index.html b/files/templates/megathread_index.html index 57f7d1620..b37b97928 100644 --- a/files/templates/megathread_index.html +++ b/files/templates/megathread_index.html @@ -14,7 +14,7 @@ ), ( 'Submit Marseys', - 'For original Marseys or other emoji.', + 'For original Marseys or other emojis.', 'fa-cat', '#ffa500', '/post/16583', ), 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 @@ -
- {% 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 %} + +
    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)}}