refactor bday event

files/helpers/config/awards.py

@@ -89,7 +89,7 @@ AWARDS = {
 		"deflectable": True,
 		"cosmetic": False,
 		"ghost": False,
-		"enabled": IS_EVENT() and SITE_NAME == "rDrama",
+		"enabled": IS_MUSICAL_EVENT() and SITE_NAME == "rDrama",
 		"negative": False,
 		"included_in_lootbox": False,
 	},
@@ -392,7 +392,7 @@ AWARDS = {
 		"included_in_lootbox": False,
 	},
 
-	### Birthgay/Birthdead
+	### Birthday
 	"confetti": {
 		"kind": "confetti",
 		"title": "Confetti",
@@ -403,7 +403,7 @@ AWARDS = {
 		"deflectable": False,
 		"cosmetic": True,
 		"ghost": True,
-		"enabled": IS_BIRTHGAY() or IS_BIRTHDEAD(),
+		"enabled": IS_BDAY(),
 		"negative": False,
 		"included_in_lootbox": False,
 	},

files/helpers/config/const.py

@@ -1042,15 +1042,15 @@ dkd_end = datetime.datetime.strptime(f'10/4/{t.year}', '%d/%m/%Y')
 def IS_DKD():
 	return SITE_NAME == 'rDrama' and dkd_begin < datetime.datetime.now() < dkd_end
 
-birthgay_begin = datetime.datetime.strptime(f'20/5/{t.year}', '%d/%m/%Y')
-birthgay_end = datetime.datetime.strptime(f'22/5/{t.year}', '%d/%m/%Y')
-def IS_BIRTHGAY():
-	return SITE_NAME == 'rDrama' and birthgay_begin < datetime.datetime.now() < birthgay_end
 
-birthdead_begin = datetime.datetime.strptime(f'26/4/{t.year}', '%d/%m/%Y')
-birthdead_end = datetime.datetime.strptime(f'28/4/{t.year}', '%d/%m/%Y')
-def IS_BIRTHDEAD():
-	return SITE_NAME == 'WPD' and birthdead_begin < datetime.datetime.now() < birthdead_end
+if SITE_NAME == 'rDrama':
+	bday_begin = datetime.datetime.strptime(f'20/5/{t.year}', '%d/%m/%Y')
+	bday_end = datetime.datetime.strptime(f'22/5/{t.year}', '%d/%m/%Y')
+else:
+	bday_begin = datetime.datetime.strptime(f'26/4/{t.year}', '%d/%m/%Y')
+	bday_end = datetime.datetime.strptime(f'28/4/{t.year}', '%d/%m/%Y')
+def IS_BDAY():
+	return bday_begin < datetime.datetime.now() < bday_end
 
 def IS_EVENT():
 	if IS_FISTMAS():
@@ -1059,12 +1059,14 @@ def IS_EVENT():
 		return "homoween"
 	elif IS_DKD():
 		return "DKD"
-	elif IS_BIRTHGAY():
-		return "birthgay"
-	elif IS_BIRTHDEAD():
-		return "birthdead"
+	elif IS_BDAY():
+		return "bday"
+
 	return None
 
+def IS_MUSICAL_EVENT():
+	return IS_FISTMAS() or IS_HOMOWEEN() or IS_DKD()
+
 fourth_begin = datetime.datetime.strptime(f'4/7/{t.year}', '%d/%m/%Y')
 fourth_end = datetime.datetime.strptime(f'5/7/{t.year}', '%d/%m/%Y')
 def IS_FOURTH():

files/routes/jinja2.py

@@ -89,6 +89,7 @@ def selected_tab(request):
 
 @app.template_filter("seeded_random")
 def seeded_random(choices, p):
+	choices = [x for x in choices if not x.startswith('.')]
 	if request.path.startswith('/post/') and p:
 		random.seed(p.id)
 		chosen = random.choice(choices)
@@ -196,8 +197,8 @@ 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,
 			"SITE_FULL_IMAGES": SITE_FULL_IMAGES,
-			"IS_EVENT":IS_EVENT, "IS_FISTMAS":IS_FISTMAS, "IS_HOMOWEEN":IS_HOMOWEEN,
-			"IS_DKD":IS_DKD, "IS_BIRTHGAY":IS_BIRTHGAY, "IS_BIRTHDEAD":IS_BIRTHDEAD, "IS_FOURTH":IS_FOURTH,
+			"IS_EVENT":IS_EVENT, "IS_MUSICAL_EVENT":IS_MUSICAL_EVENT, "IS_FISTMAS":IS_FISTMAS, "IS_HOMOWEEN":IS_HOMOWEEN,
+			"IS_DKD":IS_DKD, "IS_BDAY":IS_BDAY, "IS_FOURTH":IS_FOURTH,
 			"CHUD_PHRASES":CHUD_PHRASES, "hasattr":hasattr, "calc_users":calc_users, "HOLE_INACTIVITY_DELETION":HOLE_INACTIVITY_DELETION,
 			"LIGHT_THEMES":LIGHT_THEMES, "DARK_THEMES":DARK_THEMES, "NSFW_EMOJIS":NSFW_EMOJIS, "HOLES":HOLES, "CARP_ID":CARP_ID,
 			"MAX_IMAGE_AUDIO_SIZE_MB":MAX_IMAGE_AUDIO_SIZE_MB, "MAX_IMAGE_AUDIO_SIZE_MB_PATRON":MAX_IMAGE_AUDIO_SIZE_MB_PATRON,

files/routes/settings.py

@@ -199,7 +199,7 @@ def settings_personal_post(v):
 		updated = True
 		session["nsfw_warnings"] = int(request.values.get("nsfw_warnings") == 'true')
 
-	elif not updated and IS_EVENT() and request.values.get("event_music", v.event_music) != v.event_music:
+	elif not updated and IS_MUSICAL_EVENT() and request.values.get("event_music", v.event_music) != v.event_music:
 		if not v.grinch:
 			abort(403, "You need to award yourself the grinch award to be able to disable event music!")
 		updated = True

files/routes/wrappers.py

@@ -118,7 +118,7 @@ def get_logged_in_user():
 
 	g.is_tor = (request.headers.get("cf-ipcountry") == "T1" and not (v and v.truescore >= 1000))
 
-	if v and not IS_EVENT():
+	if v and not IS_MUSICAL_EVENT():
 		session.pop("event_music", None)
 
 	g.show_nsfw = SITE_NAME == 'WPD' or (v and not v.nsfw_warnings) or session.get('nsfw_cookies', 0) >= int(time.time())

files/templates/awards.html

@@ -29,7 +29,7 @@
 		{{stackable_award('firework')}}
 	{% endif %}
 
-	{% if p.award_count("confetti", v) and (IS_BIRTHGAY() or IS_BIRTHDEAD()) %}
+	{% if p.award_count("confetti", v) and IS_BDAY() %}
 		<div class="confetti w-100 h-100"></div>
 	{% endif %}
 

files/templates/default.html

@@ -26,8 +26,10 @@
 					{% set src = macros.random_image("assets/images/" ~ SITE_NAME ~ "/orgy_banners") %}
 					{% set href = "/chat/1" %}
 					{% set expand = false %}
-				{% elif IS_DKD() or IS_BIRTHGAY() or IS_BIRTHDEAD() %}
+				{% elif IS_DKD() %}
 					{% set src = macros.random_image("assets/events/" ~ IS_EVENT() ~ "/images/banners") %}
+				{% elif IS_BDAY() %}
+					{% set src = macros.random_image("assets/events/" ~ IS_EVENT() ~ "/images/banners/" ~ SITE_NAME) %}
 				{% elif IS_FOURTH() %}
 					{% set src = SITE_FULL_IMAGES ~ '/i/rDrama/4th-of-july-banner.webp' %}
 				{% elif SITE_NAME == "rDrama" %}
@@ -137,7 +139,7 @@
 		{% endif %}
 	{% endif %}
 
-	{% if IS_EVENT() and not (SITE_NAME == 'WPD' and not v) and (not v or v.event_music) and not (hole and hole.name == 'music') and not (u and u.song) and not (IS_HOMOWEEN() and p and p.award_count("haunt", v)) and not (p and p.embed and p.domain == 'twitter.com') %}
+	{% if IS_MUSICAL_EVENT() and not (SITE_NAME == 'WPD' and not v) and (not v or v.event_music) and not (hole and hole.name == 'music') and not (u and u.song) and not (IS_HOMOWEEN() and p and p.award_count("haunt", v)) and not (p and p.embed and p.domain == 'twitter.com') %}
 		{% set path = "assets/events/" ~ IS_EVENT() ~ "/music" %}
 		{% set song = SITE_FULL ~ "/" ~ path ~ "/" ~ listdir('files/'~path)|seeded_random(id) ~ '?x=45' %}
 		<audio id="event-song" hidden preload="none" src="{{song}}" loop></audio>

files/templates/header.html

@@ -93,6 +93,13 @@
 						'marseypilgrim',
 						'carppilgrim',
 					] -%}
+				{% elif IS_BDAY() %}
+					{%- set icons = [
+						'marseyparty',
+						'marseyballoon3',
+						'marseyballoons',
+						'marseycupcake',
+					] -%}
 				{% elif IS_DKD() %}
 					{%- set icons = [
 						'diddykongstand',

files/templates/settings/advanced.html

@@ -7,7 +7,7 @@
 				<section id="site-settings-device-specific-section" class="settings-section-section"> {# note: not using the thing from common just because of how much stuff there is in here #}
 					<h5>Device-specific Settings</h5>
 					<div class="settings-section rounded">
-						{% if IS_EVENT() %}
+						{% if IS_MUSICAL_EVENT() %}
 							{{common.toggle_section('Event Music', 'event_music_switch', 'event_music', v.event_music, 'Toggle event music.', false)}}
 						{% endif %}
 

files/templates/sidebar_WPD.html

@@ -21,8 +21,8 @@
 
 	{% if hole and hole.sidebarurls %}
 		{% set image = hole.random_sidebar %}
-	{% elif IS_FISTMAS() %}
-		{% set image = macros.random_image("assets/events/" ~ IS_EVENT() ~ "/images/sidebar/" ~ SITE_NAME ) %}
+	{% elif IS_FISTMAS() or IS_BDAY() %}
+		{% set image = macros.random_image("assets/events/" ~ IS_EVENT() ~ "/images/sidebar/" ~ SITE_NAME) %}
 	{% elif IS_EVENT() %}
 		{% set image = macros.random_image("assets/events/" ~ IS_EVENT() ~ "/images/sidebar") %}
 	{% else %}

files/templates/sidebar_rDrama.html

@@ -17,8 +17,8 @@
 
 	{% if hole and hole.sidebarurls %}
 		{% set image = hole.random_sidebar %}
-	{% elif IS_FISTMAS() %}
-		{% set image = macros.random_image("assets/events/" ~ IS_EVENT() ~ "/images/sidebar/" ~ SITE_NAME ) %}
+	{% elif IS_FISTMAS() or IS_BDAY() %}
+		{% set image = macros.random_image("assets/events/" ~ IS_EVENT() ~ "/images/sidebar/" ~ SITE_NAME) %}
 	{% elif IS_EVENT() %}
 		{% set image = macros.random_image("assets/events/" ~ IS_EVENT() ~ "/images/sidebar") %}
 	{% elif v and v.chud %}