Un-deploy Birthgay event.

Removes temporary changes for the Birthgay 2022 event, ending
approximately at 2022-05-23 0600Z. Changes:
 - Double XP disabled.
 - Lootboxes disabled.
 - Three event awards given real descriptions and colors.
 - Partyhats: restored to cakeday-only condition and tooltip.
 - Header UI: balloons removed, text visibility outline removed,
   journoid banner reverted, marseyjam as header icon.
 - Birthgay banners: removed from template, moved to new storage dir.

Confetti, though remaining as a permanent award, has been temporarily
removed pending a less performance-intensive implementation and one
that doesn't require maintaining a third-party package in the codebase.

files/classes/user.py

@@ -188,8 +188,6 @@ class User(Base):
 	@property
 	@lazy
 	def is_cakeday(self):
-		if SITE_NAME == 'rDrama': return True
-		else: return False
 		if time.time() - self.created_utc > 363 * 86400:
 			date = time.strftime("%d %b", time.gmtime(self.created_utc))
 			now = time.strftime("%d %b", time.gmtime())

files/helpers/const.py

@@ -397,7 +397,7 @@ AWARDS = {
 	"lootbox": {
 		"kind": "lootbox",
 		"title": "Lootbox",
-		"description": "???",
+		"description": "",
 		"icon": "fas fa-box-open",
 		"color": "text-blue",
 		"price": 1000
@@ -442,6 +442,30 @@ AWARDS = {
 		"color": "text-yellow",
 		"price": 300
 	},
+	"firework": {
+		"kind": "firework",
+		"title": "Fireworks",
+		"description": "Summons fireworks on the post.",
+		"icon": "fas fa-bahai",
+		"color": "text-danger",
+		"price": 300
+	},
+	"confetti": {
+		"kind": "confetti",
+		"title": "Confetti",
+		"description": "Summons confetti to fall on the post.",
+		"icon": "fas fa-party-horn",
+		"color": "text-yellow",
+		"price": 300
+	},
+	"ricardo": {
+		"kind": "ricardo",
+		"title": "Stripper Cake",
+		"description": "Summons Ricardo to dance on the post.",
+		"icon": "fas fa-pinata",
+		"color": "text-pink",
+		"price": 500
+	},
 	"tilt": {
 		"kind": "tilt",
 		"title": "Tilt",
@@ -634,30 +658,6 @@ AWARDS = {
 		"color": "checkmark",
 		"price": 100000
 	},
-	"firework": {
-		"kind": "firework",
-		"title": "Fireworks",
-		"description": "PARTY TIME!",
-		"icon": "fas fa-bahai",
-		"color": "text-blue-200",
-		"price": 300
-	},
-	"confetti": {
-		"kind": "confetti",
-		"title": "Confetti",
-		"description": "PARTY TIME!",
-		"icon": "fas fa-party-horn",
-		"color": "text-blue-200",
-		"price": 300
-	},
-	"ricardo": {
-		"kind": "ricardo",
-		"title": "Stripper Cake",
-		"description": "PARTY TIME!",
-		"icon": "fas fa-pinata",
-		"color": "text-blue-200",
-		"price": 500
-	},
 }
 
 if SITE_NAME == 'PCM':
@@ -699,7 +699,7 @@ AWARDS3 = {}
 for k, val in AWARDS2.items():
 	if val['price'] == 300: AWARDS3[k] = val
 
-DOUBLE_XP_ENABLED = 1652997600 # set to unixtime for when DXP begins, -1 to disable
+DOUBLE_XP_ENABLED = -1 # set to unixtime for when DXP begins, -1 to disable
 
 TROLLTITLES = [
 	"how will @{username} ever recover?",

files/templates/comments.html

@@ -207,7 +207,7 @@
 					{% if not c.author %}
 						{{c.print()}}
 					{% endif %}
-					<a class="user-name text-decoration-none" href="{{c.author.url}}" data-pop-info='{{c.author.json_popover(v) | tojson}}' onclick='popclick(event)' data-bs-placement="bottom" data-bs-toggle="popover" data-bs-trigger="click" data-content-id="popover" role="button" tabindex="0" style="color:#{{c.author.namecolor}}; font-size:12px; font-weight:bold;"><img loading="lazy" src="{{c.author.profile_url}}" class="profile-pic-25 mr-2">{% if c.author.is_cakeday %}<img class="party-hat" src="/assets/images/party-hat.webp" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Happy birthgay!!!!">{% endif %}<span {% if c.author.patron and not c.distinguish_level %}class="patron" style="background-color:#{{c.author.namecolor}};"{% elif c.distinguish_level %}class="mod"{% endif %}>{{c.author_name}}</span></a>
+					<a class="user-name text-decoration-none" href="{{c.author.url}}" data-pop-info='{{c.author.json_popover(v) | tojson}}' onclick='popclick(event)' data-bs-placement="bottom" data-bs-toggle="popover" data-bs-trigger="click" data-content-id="popover" role="button" tabindex="0" style="color:#{{c.author.namecolor}}; font-size:12px; font-weight:bold;"><img loading="lazy" src="{{c.author.profile_url}}" class="profile-pic-25 mr-2">{% if c.author.is_cakeday %}<img class="party-hat" src="/assets/images/party-hat.webp" data-bs-toggle="tooltip" data-bs-placement="bottom" title="I’ve spent another year rotting my brain with dramaposting, please ridicule me 🤓">{% endif %}<span {% if c.author.patron and not c.distinguish_level %}class="patron" style="background-color:#{{c.author.namecolor}};"{% elif c.distinguish_level %}class="mod"{% endif %}>{{c.author_name}}</span></a>
 					{% if c.author.customtitle %}&nbsp;<bdi style="color: #{{c.author.titlecolor}}">&nbsp;{{c.author.customtitle | safe}}</bdi>{% endif %}
 				{% endif %}
 

files/templates/default.html

@@ -249,8 +249,7 @@
 		{% if sub %}
 			<img alt="/h/{{sub.name}} banner" role="button" data-bs-toggle="modal" data-bs-target="#expandImageModal" onclick="expandDesktopImage('{{sub.banner_url}}')" loading="lazy" src="{{sub.banner_url}}" width=100% style="object-fit:cover;max-height:25vw">
 		{% elif SITE_NAME == 'rDrama' %}
-			{# set path = "assets/images/" + SITE_NAME + "/banners" #}
+			{% set path = "assets/images/" + SITE_NAME + "/banners" %}
-			{% set path = "assets/images/" + SITE_NAME + "/banners-birthgay" %}
 			{% set image = "/" + path + "/" + listdir('files/' + path)|random() + '?v=25' %}
 
 			<a href="https://secure.transequality.org/site/Donation2?df_id=1480">

files/templates/header.html

@@ -8,15 +8,6 @@
 					padding-top: 69.55px !important
 				}
 			}
-		
-			/* Birthgay specific */
-			#navbar i, #navbar .nav-link {
-				text-shadow: 1px 1px 0 black, 1px -1px 0 black, -1px 1px 0 black, -1px -1px 0 black;
-			}
-			.navbar-light .navbar-nav .nav-link, .navbar-light .navbar-nav .nav-link:hover {
-				color: #FFF !important;
-			}
-			/* End birthgay specific */
 		</style>
 	{% else %}
 		<style>
@@ -30,25 +21,13 @@
 	{% endif %}
 
 	{% if SITE_NAME == 'rDrama' %}
-		{# include "journoid_banner.html" #}
+		{% include "journoid_banner.html" %}
-		<div class="srd">
-		<a id="srd-link" class="text-small-mobile" style="color:white">🎉🎉🎉 Happy birthday rDrama! 🎉🎉🎉</a>
-		</div>
 	{% endif %}
 
-	{% if SITE_NAME == 'rDrama' %}
-		<div class="navbar navbar-expand-md navbar-light" id="navbar" style="background: url('/assets/images/balloons.webp') !important;">
-			<div class="container-fluid" style="padding:0; background: transparent !important">
-	{% else %}
 		<div class="navbar navbar-expand-md navbar-light" id="navbar">
 			<div class="container-fluid" style="padding:0;">
-	{% endif %}
 			<a href="/" class="navbar-brand mr-auto {% if SITE_NAME in ('PCM','WPD') and not sub %}flex-grow-1{% endif %}">
-				{% if SITE_NAME == 'rDrama' %} {# birthgay only #}
-				<img alt="header icon" height=33 src="/assets/images/emojis/marseyparty.webp?v=birthgay">
-				{% else %}
 				<img alt="header icon" height=33 src="/assets/images/{{SITE_NAME}}/headericon.webp?v=1019">
-				{% endif %}
 			</a>
 			
 			{% if sub %}

files/templates/submission.html

@@ -64,9 +64,7 @@
 {% endif %}
 
 {% if p.award_count("confetti") %}
-	<script src="/assets/js/confetti-js-master/dist/index.min.js"></script>
+	{# TODO: Confetti temporarily removed. #}
-	<script src = "/assets/js/confetti.js"></script>
-    <canvas id="confetti-canvas"></canvas>
 {% endif %}
 
 {% if p.award_count("firework") %}
@@ -713,7 +711,7 @@
 
 							{% if p.author.verified %}<i class="fas fa-badge-check align-middle ml-1 {% if p.author.verified=='Glowiefied' %}glow{% endif %}" style="color:{% if p.author.verifiedcolor %}#{{p.author.verifiedcolor}}{% else %}#1DA1F2{% endif %}" data-bs-toggle="tooltip" data-bs-placement="bottom" title="{{p.author.verified}}"></i>
 							{% endif %}
-							<a class="user-name text-decoration-none" href="{{p.author.url}}" data-pop-info='{{p.author.json_popover(v) | tojson}}' onclick='popclick(event)' data-bs-placement="bottom" data-bs-toggle="popover" data-bs-trigger="click" data-content-id="popover" role="button" tabindex="0" style="color: #{{p.author.namecolor}}; font-weight: bold"class="user-name"><img loading="lazy" src="{{p.author.profile_url}}" class="profile-pic-25 mr-2">{% if p.author.is_cakeday %}<img class="party-hat" src="/assets/images/party-hat.webp" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Happy birthgay!!!!">{% endif %}<span {% if p.author.patron and not p.distinguish_level %}class="patron" style="background-color:#{{p.author.namecolor}};"{% elif p.distinguish_level %}class="mod"{% endif %}>{{p.author_name}}</span></a>{% if p.author.customtitle %}&nbsp;<bdi style="color: #{{p.author.titlecolor}}">&nbsp;{{p.author.customtitle | safe}}</bdi>{% endif %}
+							<a class="user-name text-decoration-none" href="{{p.author.url}}" data-pop-info='{{p.author.json_popover(v) | tojson}}' onclick='popclick(event)' data-bs-placement="bottom" data-bs-toggle="popover" data-bs-trigger="click" data-content-id="popover" role="button" tabindex="0" style="color: #{{p.author.namecolor}}; font-weight: bold"class="user-name"><img loading="lazy" src="{{p.author.profile_url}}" class="profile-pic-25 mr-2">{% if p.author.is_cakeday %}<img class="party-hat" src="/assets/images/party-hat.webp" data-bs-toggle="tooltip" data-bs-placement="bottom" title="I’ve spent another year rotting my brain with dramaposting, please ridicule me 🤓">{% endif %}<span {% if p.author.patron and not p.distinguish_level %}class="patron" style="background-color:#{{p.author.namecolor}};"{% elif p.distinguish_level %}class="mod"{% endif %}>{{p.author_name}}</span></a>{% if p.author.customtitle %}&nbsp;<bdi style="color: #{{p.author.titlecolor}}">&nbsp;{{p.author.customtitle | safe}}</bdi>{% endif %}
 						{% endif %}
 						<span data-bs-toggle="tooltip" data-bs-placement="bottom" id="timestamp" onmouseover="timestamp('timestamp','{{p.created_utc}}')">&nbsp;{{p.age_string}}</span>
 						({% if p.is_image %}image post{% elif p.is_video %}video post{% elif p.domain %}<a href="/search/posts/?q=domain%3A{{p.domain}}&sort=new&t=all" {% if not v or v.newtabexternal %}target="_blank"{% endif %}>{{p.domain}}</a>{% else %}text post{% endif %})

files/templates/submission_listing.html

@@ -186,7 +186,7 @@
 
 					{% if p.author.verified %}<i class="fas fa-badge-check align-middle ml-1 {% if p.author.verified=='Glowiefied' %}glow{% endif %}" style="color:{% if p.author.verifiedcolor %}#{{p.author.verifiedcolor}}{% else %}#1DA1F2{% endif %}" data-bs-toggle="tooltip" data-bs-placement="bottom" title="{{p.author.verified}}"></i>
 					{% endif %}
-					<a class="user-name text-decoration-none" href="{{p.author.url}}" data-pop-info='{{p.author.json_popover(v) | tojson}}' onclick='popclick(event)' data-bs-placement="bottom" data-bs-toggle="popover" data-bs-trigger="click" data-content-id="popover" role="button" tabindex="0" style="color: #{{p.author.namecolor}}; font-weight: bold;"><img loading="lazy" src="{{p.author.profile_url}}" class="profile-pic-25 mr-2">{% if p.author.is_cakeday %}<img class="party-hat" src="/assets/images/party-hat.webp" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Happy birthgay!!!!">{% endif %}<span {% if p.author.patron and not p.distinguish_level %}class="patron" style="background-color:#{{p.author.namecolor}};"{% elif p.distinguish_level %}class="mod"{% endif %}>{{p.author_name}}</span></a>{% if p.author.customtitle %}<bdi style="color: #{{p.author.titlecolor}}">&nbsp;&nbsp;{{p.author.customtitle | safe}}</bdi>{% endif %}
+					<a class="user-name text-decoration-none" href="{{p.author.url}}" data-pop-info='{{p.author.json_popover(v) | tojson}}' onclick='popclick(event)' data-bs-placement="bottom" data-bs-toggle="popover" data-bs-trigger="click" data-content-id="popover" role="button" tabindex="0" style="color: #{{p.author.namecolor}}; font-weight: bold;"><img loading="lazy" src="{{p.author.profile_url}}" class="profile-pic-25 mr-2">{% if p.author.is_cakeday %}<img class="party-hat" src="/assets/images/party-hat.webp" data-bs-toggle="tooltip" data-bs-placement="bottom" title="I’ve spent another year rotting my brain with dramaposting, please ridicule me 🤓">{% endif %}<span {% if p.author.patron and not p.distinguish_level %}class="patron" style="background-color:#{{p.author.namecolor}};"{% elif p.distinguish_level %}class="mod"{% endif %}>{{p.author_name}}</span></a>{% if p.author.customtitle %}<bdi style="color: #{{p.author.titlecolor}}">&nbsp;&nbsp;{{p.author.customtitle | safe}}</bdi>{% endif %}
 				{% endif %}
 				<span data-bs-toggle="tooltip" data-bs-placement="bottom" onmouseover="timestamp('timestamp-{{p.id}}','{{p.created_utc}}')" id="timestamp-{{p.id}}">&nbsp;{{p.age_string}}</span>
 				&nbsp;

files/templates/userpage.html

@@ -40,7 +40,7 @@
 					<div class="d-md-flex text-center text-md-left">
 						<div>
 							<a rel="nofollow noopener noreferrer" href="{% if u.highres %}{{u.highres}}{% else %}{{u.profile_url}}{% endif %}"><img loading="lazy" src="{{u.profile_url}}" class="profile-pic profile-pic-100 mb-5"></a>
-							{% if u.is_cakeday %}<img class="party-hat2" src="/assets/images/party-hat.webp" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Happy birthgay!!!!">{% endif %}
+							{% if u.is_cakeday %}<img class="party-hat2" src="/assets/images/party-hat.webp" data-bs-toggle="tooltip" data-bs-placement="bottom" title="I’ve spent another year rotting my brain with dramaposting, please ridicule me 🤓">{% endif %}
 						</div>
 						<div id="profilestuff" class="ml-3 w-100">
 							{% if u.is_suspended %}
@@ -365,7 +365,7 @@
 		<div class="col">
 			<div style="margin-top: -34px;">
 				<a rel="nofollow noopener noreferrer" href="{% if u.highres %}{{u.highres}}{% else %}{{u.profile_url}}{% endif %}"><img loading="lazy" src="{{u.profile_url}}" class="profile-pic-65 bg-white border-2 border-white mb-2"></a>
-				{% if u.is_cakeday %}<img class="party-hat3" src="/assets/images/party-hat.webp" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Happy birthgay!!!!">{% endif %}
+				{% if u.is_cakeday %}<img class="party-hat3" src="/assets/images/party-hat.webp" data-bs-toggle="tooltip" data-bs-placement="bottom" title="I’ve spent another year rotting my brain with dramaposting, please ridicule me 🤓">{% endif %}
 			</div>
 			<div class="mt-n3 py-3">
 				{% if u.is_suspended %}