diff --git a/files/assets/birthgay/images/banners/WPD/1.webp b/files/assets/birthgay/images/banners/WPD/1.webp new file mode 100644 index 0000000000..b8ed4f14f5 Binary files /dev/null and b/files/assets/birthgay/images/banners/WPD/1.webp differ diff --git a/files/assets/birthgay/images/banners/rDrama/1.webp b/files/assets/birthgay/images/banners/rDrama/1.webp new file mode 100644 index 0000000000..1f37b0bd2d Binary files /dev/null and b/files/assets/birthgay/images/banners/rDrama/1.webp differ diff --git a/files/assets/birthgay/images/banners/rDrama/12.webp b/files/assets/birthgay/images/banners/rDrama/12.webp new file mode 100644 index 0000000000..45952d07a5 Binary files /dev/null and b/files/assets/birthgay/images/banners/rDrama/12.webp differ diff --git a/files/assets/birthgay/images/banners/rDrama/13.webp b/files/assets/birthgay/images/banners/rDrama/13.webp new file mode 100644 index 0000000000..801e6af50a Binary files /dev/null and b/files/assets/birthgay/images/banners/rDrama/13.webp differ diff --git a/files/assets/birthgay/images/banners/rDrama/14.webp b/files/assets/birthgay/images/banners/rDrama/14.webp new file mode 100644 index 0000000000..1c720f418d Binary files /dev/null and b/files/assets/birthgay/images/banners/rDrama/14.webp differ diff --git a/files/assets/birthgay/images/banners/rDrama/15.webp b/files/assets/birthgay/images/banners/rDrama/15.webp new file mode 100644 index 0000000000..167487999e Binary files /dev/null and b/files/assets/birthgay/images/banners/rDrama/15.webp differ diff --git a/files/assets/birthgay/images/banners/rDrama/19.webp b/files/assets/birthgay/images/banners/rDrama/19.webp new file mode 100644 index 0000000000..630af1ab54 Binary files /dev/null and b/files/assets/birthgay/images/banners/rDrama/19.webp differ diff --git a/files/assets/birthgay/images/banners/rDrama/2.webp b/files/assets/birthgay/images/banners/rDrama/2.webp new file mode 100644 index 0000000000..00ea727afb Binary files /dev/null and b/files/assets/birthgay/images/banners/rDrama/2.webp differ diff --git a/files/assets/birthgay/images/banners/rDrama/20.webp b/files/assets/birthgay/images/banners/rDrama/20.webp new file mode 100644 index 0000000000..d2694ddc88 Binary files /dev/null and b/files/assets/birthgay/images/banners/rDrama/20.webp differ diff --git a/files/assets/birthgay/images/banners/rDrama/22.webp b/files/assets/birthgay/images/banners/rDrama/22.webp new file mode 100644 index 0000000000..7982e70a18 Binary files /dev/null and b/files/assets/birthgay/images/banners/rDrama/22.webp differ diff --git a/files/assets/birthgay/images/banners/rDrama/23.webp b/files/assets/birthgay/images/banners/rDrama/23.webp new file mode 100644 index 0000000000..46cebbe2e0 Binary files /dev/null and b/files/assets/birthgay/images/banners/rDrama/23.webp differ diff --git a/files/assets/birthgay/images/banners/rDrama/4.webp b/files/assets/birthgay/images/banners/rDrama/4.webp new file mode 100644 index 0000000000..403f8d3cbc Binary files /dev/null and b/files/assets/birthgay/images/banners/rDrama/4.webp differ diff --git a/files/assets/birthgay/images/banners/rDrama/6.webp b/files/assets/birthgay/images/banners/rDrama/6.webp new file mode 100644 index 0000000000..f6fa3413bc Binary files /dev/null and b/files/assets/birthgay/images/banners/rDrama/6.webp differ diff --git a/files/assets/birthgay/images/banners/rDrama/8.webp b/files/assets/birthgay/images/banners/rDrama/8.webp new file mode 100644 index 0000000000..51610839ee Binary files /dev/null and b/files/assets/birthgay/images/banners/rDrama/8.webp differ diff --git a/files/assets/birthgay/images/banners/rDrama/9.webp b/files/assets/birthgay/images/banners/rDrama/9.webp new file mode 100644 index 0000000000..c8c9d6e0d7 Binary files /dev/null and b/files/assets/birthgay/images/banners/rDrama/9.webp differ diff --git a/files/assets/birthgay/images/sidebar/WPD/1.webp b/files/assets/birthgay/images/sidebar/WPD/1.webp new file mode 100644 index 0000000000..2f0a3ded19 Binary files /dev/null and b/files/assets/birthgay/images/sidebar/WPD/1.webp differ diff --git a/files/assets/birthgay/images/sidebar/WPD/2.webp b/files/assets/birthgay/images/sidebar/WPD/2.webp new file mode 100644 index 0000000000..dea4e63cc3 Binary files /dev/null and b/files/assets/birthgay/images/sidebar/WPD/2.webp differ diff --git a/files/assets/birthgay/images/sidebar/WPD/3.webp b/files/assets/birthgay/images/sidebar/WPD/3.webp new file mode 100644 index 0000000000..f83f0726d3 Binary files /dev/null and b/files/assets/birthgay/images/sidebar/WPD/3.webp differ diff --git a/files/assets/birthgay/images/sidebar/WPD/4.webp b/files/assets/birthgay/images/sidebar/WPD/4.webp new file mode 100644 index 0000000000..1e6ffb863b Binary files /dev/null and b/files/assets/birthgay/images/sidebar/WPD/4.webp differ diff --git a/files/assets/birthgay/images/sidebar/WPD/5.webp b/files/assets/birthgay/images/sidebar/WPD/5.webp new file mode 100644 index 0000000000..8e09fe2a71 Binary files /dev/null and b/files/assets/birthgay/images/sidebar/WPD/5.webp differ diff --git a/files/assets/birthgay/images/sidebar/WPD/6.webp b/files/assets/birthgay/images/sidebar/WPD/6.webp new file mode 100644 index 0000000000..24fb18ea6c Binary files /dev/null and b/files/assets/birthgay/images/sidebar/WPD/6.webp differ diff --git a/files/assets/birthgay/images/sidebar/WPD/7.webp b/files/assets/birthgay/images/sidebar/WPD/7.webp new file mode 100644 index 0000000000..6a09a27dd5 Binary files /dev/null and b/files/assets/birthgay/images/sidebar/WPD/7.webp differ diff --git a/files/helpers/config/const.py b/files/helpers/config/const.py index c3ee76c22f..b909d7bdee 100644 --- a/files/helpers/config/const.py +++ b/files/helpers/config/const.py @@ -4,23 +4,6 @@ from os import environ, path import tldextract import datetime -t = datetime.datetime.now() - -fistmas_begin = datetime.datetime.strptime(f'1/12/{t.year}', '%d/%m/%Y') -fistmas_end = datetime.datetime.strptime(f'30/12/{t.year}', '%d/%m/%Y') -def IS_FISTMAS(): - return fistmas_begin < datetime.datetime.now() < fistmas_end - -homoween_begin = datetime.datetime.strptime(f'15/10/{t.year}', '%d/%m/%Y') -homoween_end = datetime.datetime.strptime(f'1/11/{t.year}', '%d/%m/%Y') -def IS_HOMOWEEN(): - return homoween_begin < datetime.datetime.now() < homoween_end - -dkd_begin = datetime.datetime.strptime(f'25/4/{t.year}', '%d/%m/%Y') -dkd_end = datetime.datetime.strptime(f'2/5/{t.year}', '%d/%m/%Y') -def IS_DKD(): - return SITE_NAME == 'rDrama' and dkd_begin < datetime.datetime.now() < dkd_end - DEFAULT_TIME_FILTER = "all" DEFAULT_THEME = "midnight" DEFAULT_COLOR = "805ad5" @@ -1093,3 +1076,30 @@ else: STARS = '\n\n★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★\n\n' EMOJI_KINDS = ("Marsey", "Platy", "Wolf", "Tay", "Donkey Kong", "Marsey Flags", "Marsey Alphabet", "Classic", "Rage", "Wojak", "Misc") + +t = datetime.datetime.now() + +fistmas_begin = datetime.datetime.strptime(f'1/12/{t.year}', '%d/%m/%Y') +fistmas_end = datetime.datetime.strptime(f'30/12/{t.year}', '%d/%m/%Y') +def IS_FISTMAS(): + return fistmas_begin < datetime.datetime.now() < fistmas_end + +homoween_begin = datetime.datetime.strptime(f'15/10/{t.year}', '%d/%m/%Y') +homoween_end = datetime.datetime.strptime(f'1/11/{t.year}', '%d/%m/%Y') +def IS_HOMOWEEN(): + return homoween_begin < datetime.datetime.now() < homoween_end + +dkd_begin = datetime.datetime.strptime(f'25/4/{t.year}', '%d/%m/%Y') +dkd_end = datetime.datetime.strptime(f'2/5/{t.year}', '%d/%m/%Y') +def IS_DKD(): + return SITE_NAME == 'rDrama' and dkd_begin < datetime.datetime.now() < dkd_end + +if SITE_NAME == 'rDrama': + birthgay_begin = datetime.datetime.strptime(f'20/5/{t.year}', '%d/%m/%Y') + birthgay_end = datetime.datetime.strptime(f'21/5/{t.year}', '%d/%m/%Y') +else: + birthgay_begin = datetime.datetime.strptime(f'26/4/{t.year}', '%d/%m/%Y') + birthgay_end = datetime.datetime.strptime(f'27/5/{t.year}', '%d/%m/%Y') + +def IS_BIRTHGAY(): + return birthgay_begin < datetime.datetime.now() < birthgay_end diff --git a/files/routes/jinja2.py b/files/routes/jinja2.py index 641449224d..45f40882db 100644 --- a/files/routes/jinja2.py +++ b/files/routes/jinja2.py @@ -137,5 +137,5 @@ def inject_constants(): "git_head":git_head, "max_days":max_days, "EMOJI_KINDS":EMOJI_KINDS, "BIO_FRIENDS_ENEMIES_LENGTH_LIMIT":BIO_FRIENDS_ENEMIES_LENGTH_LIMIT, "IMMUNE_TO_AWARDS": IMMUNE_TO_AWARDS, "SITE_FULL_IMAGES": SITE_FULL_IMAGES, - "IS_FISTMAS":IS_FISTMAS, "IS_HOMOWEEN":IS_HOMOWEEN, "IS_DKD":IS_DKD + "IS_FISTMAS":IS_FISTMAS, "IS_HOMOWEEN":IS_HOMOWEEN, "IS_DKD":IS_DKD, "IS_BIRTHGAY":IS_BIRTHGAY, } diff --git a/files/routes/votes.py b/files/routes/votes.py index de6c7a06c2..fe56ccd989 100644 --- a/files/routes/votes.py +++ b/files/routes/votes.py @@ -88,7 +88,7 @@ def vote_post_comment(target_id, new, v, cls, vote_cls): if SITE_NAME == 'WPD': coin_mult *= 2 - if IS_FISTMAS() or IS_HOMOWEEN() or IS_DKD(): + if IS_FISTMAS() or IS_HOMOWEEN() or IS_DKD() or IS_BIRTHGAY(): coin_mult *= 2 coin_value = coin_delta * coin_mult diff --git a/files/templates/default.html b/files/templates/default.html index 9284d7a8b2..a07fd22123 100644 --- a/files/templates/default.html +++ b/files/templates/default.html @@ -7,7 +7,9 @@ {% if IS_FISTMAS() and not sub %} {% include 'fistmas/banner.html' %} {% else %} - {% if IS_DKD() and not sub %} + {% if IS_BIRTHGAY() and not sub %} + {% set src = macros.random_image("assets/birthgay/images/banners/" ~ SITE_NAME) %} + {% elif IS_DKD() and not sub %} {% set src = macros.random_image("assets/DKD/images/banners") %} {% elif err and SITE_NAME == 'rDrama' %} {% set src = "banner_error.webp" | asset_siteimg %} diff --git a/files/templates/sidebar_WPD.html b/files/templates/sidebar_WPD.html index fc7e78acbe..5d6b01c485 100644 --- a/files/templates/sidebar_WPD.html +++ b/files/templates/sidebar_WPD.html @@ -6,15 +6,17 @@ - {%- if v -%} - {%- set art_image = macros.random_image("assets/images/" ~ SITE_NAME ~ "/sidebar") -%} + {%- if IS_BIRTHGAY() -%} + {% set image = macros.random_image("assets/birthgay/images/sidebar/" ~ SITE_NAME) %} + {%- elif v -%} + {%- set image = macros.random_image("assets/images/" ~ SITE_NAME ~ "/sidebar") -%} {%- else -%} - {%- set art_image = '/i/' ~ SITE_NAME ~ '/sidebar.webp?x=1' -%} + {%- set image = '/i/' ~ SITE_NAME ~ '/sidebar.webp?x=1' -%} {%- endif -%} {% if request.path != '/sidebar' %} - - sidebar image + + sidebar image {% endif %} diff --git a/files/templates/sidebar_rDrama.html b/files/templates/sidebar_rDrama.html index 357f40ccfc..4f8c9d69f0 100644 --- a/files/templates/sidebar_rDrama.html +++ b/files/templates/sidebar_rDrama.html @@ -8,6 +8,8 @@ {% if sub %} {% set image=sub.sidebar_url %} + {% elif IS_BIRTHGAY() %} + {% set image = macros.random_image("assets/birthgay/images/sidebar/" ~ SITE_NAME) %} {% elif IS_DKD() %} {% set image = macros.random_image("assets/DKD/images/sidebar") %} {% elif IS_FISTMAS() %}