diff --git a/files/classes/user.py b/files/classes/user.py index 87117a766..8b41a336c 100644 --- a/files/classes/user.py +++ b/files/classes/user.py @@ -259,7 +259,10 @@ class User(Base): if HOLIDAY_EVENT: from files.events.helpers.const import EVENT_FORCED_HATS if EVENT_FORCED_HATS: - return (random.choice(EVENT_FORCED_HATS), 'Merry Fistmas!') + if SITE_NAME == 'rDrama': + return (random.choice(EVENT_FORCED_HATS), 'Merry Fistmas!') + else: + return (random.choice(EVENT_FORCED_HATS), 'Merry Christmas!') if self.is_cakeday: return ('/i/hats/Cakeday.webp', "I've spent another year rotting my brain with dramaposting, please ridicule me 🤓") diff --git a/files/events/helpers/jinja.py b/files/events/helpers/jinja.py index b2f103f09..75273ab7f 100644 --- a/files/events/helpers/jinja.py +++ b/files/events/helpers/jinja.py @@ -7,7 +7,6 @@ def user_event_darkmode(target, db): return user.event_darkmode EVENT_JINJA_CONST = { - "EVENT_BANNER": "banner_rDrama.html", "EVENT_ICONS": True, "EVENT_STYLES": "blizzard.css", "EVENT_AWARDS": True, diff --git a/files/templates/default.html b/files/templates/default.html index 8913f61ad..61c718385 100644 --- a/files/templates/default.html +++ b/files/templates/default.html @@ -4,8 +4,8 @@ {% block banner %} {% include "modals/expanded_image.html" %} {% if err or '@' not in request.path %} - {% if EVENT_BANNER and not sub %} - {% include 'event/' ~ EVENT_BANNER %} + {% if HOLIDAY_EVENT and not sub %} + {% include 'event/banner.html' %} {% else %} {% if err and SITE_NAME == 'rDrama' %} {% set src = "banner_error.webp" | asset_siteimg %} diff --git a/files/templates/event/banner_rDrama.html b/files/templates/event/banner.html similarity index 78% rename from files/templates/event/banner_rDrama.html rename to files/templates/event/banner.html index 0b08b3ddf..0ecf3326c 100644 --- a/files/templates/event/banner_rDrama.html +++ b/files/templates/event/banner.html @@ -7,7 +7,11 @@ {% if random.randint(1,100) != 1 %} - {% include "event/banner.svg" %} + {% if SITE_NAME == 'rDrama' %} + {% include "event/banner_rDrama.svg" %} + {% else %} + {% include "event/banner.svg" %} + {% endif %} {% else %} {% endif %} diff --git a/files/templates/event/banner.svg b/files/templates/event/banner.svg index d3a612d07..46ccb0baa 100644 --- a/files/templates/event/banner.svg +++ b/files/templates/event/banner.svg @@ -4,7 +4,7 @@