From e6c0044d355c4092a0ab43ade9879bfefd783a8a Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Sun, 10 Apr 2022 02:37:45 +0200 Subject: [PATCH] fart --- files/helpers/const.py | 10 +++++++++- files/routes/awards.py | 12 ++++++++++++ files/templates/authforms.html | 4 ++-- files/templates/award_modal.html | 5 ----- files/templates/chat.html | 2 +- files/templates/default.html | 4 ++-- files/templates/log.html | 4 ++-- files/templates/login.html | 2 +- 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 | 12 ++++++++++++ files/templates/submit.html | 4 ++-- 15 files changed, 49 insertions(+), 22 deletions(-) diff --git a/files/helpers/const.py b/files/helpers/const.py index 7b860b803b..266852089e 100644 --- a/files/helpers/const.py +++ b/files/helpers/const.py @@ -389,7 +389,15 @@ AWARDS = { "icon": "fas fa-dice-six", "color": "text-black", "price": 777 - }, + }, + "beano": { + "kind": "beano", + "title": "Beano", + "description": "Stops you from embarrassing yourself with your flatulence", + "icon": "fas fa-gas-pump-slash", + "color": "text-green", + "price": 1000 + }, "progressivestack": { "kind": "progressivestack", "title": "Progressive Stack", diff --git a/files/routes/awards.py b/files/routes/awards.py index 2424938917..1d69ab6959 100644 --- a/files/routes/awards.py +++ b/files/routes/awards.py @@ -340,6 +340,12 @@ def award_post(pid, v): elif kind == "deflector": if author.deflector: author.deflector += 36000 else: author.deflector = int(time.time()) + 36000 + elif kind == "beano": + if not author.has_badge(128): + badge = Badge(user_id=author.id, badge_id=128) + g.db.add(badge) + g.db.flush() + send_notification(author.id, f"@AutoJanny has given you the following profile badge:\n\n![]({badge.path})\n\n{badge.name}") if author.received_award_count: author.received_award_count += 1 else: author.received_award_count = 1 @@ -572,6 +578,12 @@ def award_comment(cid, v): elif kind == "deflector": if author.deflector: author.deflector += 36000 else: author.deflector = int(time.time()) + 36000 + elif kind == "beano": + if not author.has_badge(128): + badge = Badge(user_id=author.id, badge_id=128) + g.db.add(badge) + g.db.flush() + send_notification(author.id, f"@AutoJanny has given you the following profile badge:\n\n![]({badge.path})\n\n{badge.name}") if author.received_award_count: author.received_award_count += 1 else: author.received_award_count = 1 diff --git a/files/templates/authforms.html b/files/templates/authforms.html index 831f96536e..83e5702093 100644 --- a/files/templates/authforms.html +++ b/files/templates/authforms.html @@ -15,7 +15,7 @@ {% if v %} - + {% if v.agendaposter %} - + {% endif %} diff --git a/files/templates/award_modal.html b/files/templates/award_modal.html index 52233ae97c..5043203f35 100644 --- a/files/templates/award_modal.html +++ b/files/templates/award_modal.html @@ -19,11 +19,6 @@
{{award.owned}} owned
{% endfor %} - - -
 
-
 
- diff --git a/files/templates/chat.html b/files/templates/chat.html index 57074005bf..7290fb3ff2 100644 --- a/files/templates/chat.html +++ b/files/templates/chat.html @@ -14,7 +14,7 @@ Chat - + {% if v.css %} diff --git a/files/templates/default.html b/files/templates/default.html index c8eeb16c1a..5b979d6fa5 100644 --- a/files/templates/default.html +++ b/files/templates/default.html @@ -7,7 +7,7 @@ {% if v %} - + {% if v.agendaposter %} - + {% endif %} diff --git a/files/templates/log.html b/files/templates/log.html index 37f72b36fc..36ba508757 100644 --- a/files/templates/log.html +++ b/files/templates/log.html @@ -6,7 +6,7 @@ {% block content %} {% if v %} - + {% if v.agendaposter %} - + {% endif %}
diff --git a/files/templates/login.html b/files/templates/login.html index ad37620d50..6cff61733e 100644 --- a/files/templates/login.html +++ b/files/templates/login.html @@ -18,7 +18,7 @@ {% endblock %} - + diff --git a/files/templates/login_2fa.html b/files/templates/login_2fa.html index e89ac2f34a..73394680a3 100644 --- a/files/templates/login_2fa.html +++ b/files/templates/login_2fa.html @@ -14,7 +14,7 @@ 2-Step Login - {{SITE_NAME}} - + diff --git a/files/templates/settings.html b/files/templates/settings.html index c3abe7b28b..5fdcfc9838 100644 --- a/files/templates/settings.html +++ b/files/templates/settings.html @@ -34,7 +34,7 @@ - + {% if v.agendaposter %} - + {% else %} - + {% endif %} diff --git a/files/templates/sign_up.html b/files/templates/sign_up.html index 6592c28cab..5ec071422b 100644 --- a/files/templates/sign_up.html +++ b/files/templates/sign_up.html @@ -31,7 +31,7 @@ {% if ref_user %}{{ref_user.username}} invites you to {{SITE_NAME}}{% else %}Sign up - {{SITE_NAME}}{% endif %} - + diff --git a/files/templates/sign_up_failed_ref.html b/files/templates/sign_up_failed_ref.html index e4cdfe188d..2ecceb7f23 100644 --- a/files/templates/sign_up_failed_ref.html +++ b/files/templates/sign_up_failed_ref.html @@ -32,7 +32,7 @@ {% if ref_user %}{{ref_user.username}} invites you to {{SITE_NAME}}{% else %}{{SITE_NAME}}{% endif %} - + diff --git a/files/templates/submission.html b/files/templates/submission.html index 59b7a0bbd3..925435b62a 100644 --- a/files/templates/submission.html +++ b/files/templates/submission.html @@ -41,6 +41,18 @@ {% endif %} +{% if SITE_NAME == 'rDrama' and not (v and v.has_badge(128)) %} + +{% endif %} + {% if g.inferior_browser %} {% if p.award_count("wholesome") %} - + {% if v.agendaposter %} - + {% endif %} {% endblock %}