From 6fd95ec682d129759c74020568ea4c5139737526 Mon Sep 17 00:00:00 2001
From: Oscar Hudson <hudso009@gmail.com>
Date: Wed, 26 Jul 2023 00:48:06 +0100
Subject: [PATCH 1/5] remove discriminator for pomelo usernames

---
 views/account/account.handlebars | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/account/account.handlebars b/views/account/account.handlebars
index f8bdf71..fe6783b 100644
--- a/views/account/account.handlebars
+++ b/views/account/account.handlebars
@@ -145,7 +145,7 @@
 				<div class="setting-card">
 					<h2 class="header">{{ locale.account.settings.settingCards.discord }}</h2>
 						{{#if discordUser}}
-					<p>{{ locale.account.settings.settingCards.connectedToDiscord }} {{ discordUser.username }}#{{ discordUser.discriminator }}</p>
+					<p>{{ locale.account.settings.settingCards.connectedToDiscord }} {{ discordUser.username }}{{#ifCond discordUser.discriminator '#0'}}{{else}}#{{ discordUser.discriminator }}{{/ifCond}}</p>
 					<a href="/account/remove/discord">
 						<button class="button secondary" id="remove-discord-connection">{{ locale.account.settings.settingCards.removeDiscord }}</button>
 					</a>

From bbb5e34dfb91853ea0413a34b4fe025fdd921c3f Mon Sep 17 00:00:00 2001
From: Oscar Hudson <hudso009@gmail.com>
Date: Wed, 26 Jul 2023 03:35:54 +0100
Subject: [PATCH 2/5] fix

---
 views/account/account.handlebars | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/views/account/account.handlebars b/views/account/account.handlebars
index fe6783b..b8af508 100644
--- a/views/account/account.handlebars
+++ b/views/account/account.handlebars
@@ -145,7 +145,10 @@
 				<div class="setting-card">
 					<h2 class="header">{{ locale.account.settings.settingCards.discord }}</h2>
 						{{#if discordUser}}
-					<p>{{ locale.account.settings.settingCards.connectedToDiscord }} {{ discordUser.username }}{{#ifCond discordUser.discriminator '#0'}}{{else}}#{{ discordUser.discriminator }}{{/ifCond}}</p>
+					<p>{{ locale.account.settings.settingCards.connectedToDiscord }} {{ discordUser.username }}
+					{{#if discordUser.discriminator}}
+					&nbsp;#{{ discordUser.discriminator }}
+					{{/if}}</p>
 					<a href="/account/remove/discord">
 						<button class="button secondary" id="remove-discord-connection">{{ locale.account.settings.settingCards.removeDiscord }}</button>
 					</a>

From ae3f9b691003a9be6bb0314519885ec85aa47617 Mon Sep 17 00:00:00 2001
From: William Oldham <github@binaryoverload.co.uk>
Date: Sun, 27 Jul 2025 16:49:47 +0200
Subject: [PATCH 3/5] chore: fix handlebars rendering for Discord discriminator

---
 views/account/account.handlebars | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/views/account/account.handlebars b/views/account/account.handlebars
index b8af508..ef9d422 100644
--- a/views/account/account.handlebars
+++ b/views/account/account.handlebars
@@ -145,10 +145,7 @@
 				<div class="setting-card">
 					<h2 class="header">{{ locale.account.settings.settingCards.discord }}</h2>
 						{{#if discordUser}}
-					<p>{{ locale.account.settings.settingCards.connectedToDiscord }} {{ discordUser.username }}
-					{{#if discordUser.discriminator}}
-					&nbsp;#{{ discordUser.discriminator }}
-					{{/if}}</p>
+					<p>{{ locale.account.settings.settingCards.connectedToDiscord }} {{ discordUser.username }}{{#if discordUser.discriminator }}#{{ discordUser.discriminator }}{{/if}}</p>
 					<a href="/account/remove/discord">
 						<button class="button secondary" id="remove-discord-connection">{{ locale.account.settings.settingCards.removeDiscord }}</button>
 					</a>

From ac29ce9a44b29792e5d1e2fecb9ca6f03b4f13dc Mon Sep 17 00:00:00 2001
From: William Oldham <github@binaryoverload.co.uk>
Date: Sun, 27 Jul 2025 16:56:33 +0200
Subject: [PATCH 4/5] fix: use string comparison for discriminator check

---
 views/account/account.handlebars | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/account/account.handlebars b/views/account/account.handlebars
index ef9d422..00ab735 100644
--- a/views/account/account.handlebars
+++ b/views/account/account.handlebars
@@ -145,7 +145,7 @@
 				<div class="setting-card">
 					<h2 class="header">{{ locale.account.settings.settingCards.discord }}</h2>
 						{{#if discordUser}}
-					<p>{{ locale.account.settings.settingCards.connectedToDiscord }} {{ discordUser.username }}{{#if discordUser.discriminator }}#{{ discordUser.discriminator }}{{/if}}</p>
+					<p>{{ locale.account.settings.settingCards.connectedToDiscord }} {{ discordUser.username }}{{#if ( eq discordUser.discriminator '0' ) }}#{{ discordUser.discriminator }}{{/if}}</p>
 					<a href="/account/remove/discord">
 						<button class="button secondary" id="remove-discord-connection">{{ locale.account.settings.settingCards.removeDiscord }}</button>
 					</a>

From 11e230d4e5c0c4c8976f2fbee69f7bbc04354477 Mon Sep 17 00:00:00 2001
From: William Oldham <github@binaryoverload.co.uk>
Date: Sun, 27 Jul 2025 16:57:48 +0200
Subject: [PATCH 5/5] fix: use neq instead of eq for discriminator check

---
 views/account/account.handlebars | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/account/account.handlebars b/views/account/account.handlebars
index ba0333a..d6dfcd4 100644
--- a/views/account/account.handlebars
+++ b/views/account/account.handlebars
@@ -148,7 +148,7 @@
 				<div class="setting-card">
 					<h2 class="header">{{ locale.account.settings.settingCards.discord }}</h2>
 						{{#if discordUser}}
-					<p>{{ locale.account.settings.settingCards.connectedToDiscord }} {{ discordUser.username }}{{#if ( eq discordUser.discriminator '0' ) }}#{{ discordUser.discriminator }}{{/if}}</p>
+					<p>{{ locale.account.settings.settingCards.connectedToDiscord }} {{ discordUser.username }}{{#if ( neq discordUser.discriminator '0' ) }}#{{ discordUser.discriminator }}{{/if}}</p>
 					<a href="/account/remove/discord">
 						<button class="button secondary" id="remove-discord-connection">{{ locale.account.settings.settingCards.removeDiscord }}</button>
 					</a>