From 906305b2e84f4788b4e132181282b6c873e2d47f Mon Sep 17 00:00:00 2001
From: Techbot121 <techbot121@gmail.com>
Date: Sun, 1 Dec 2024 12:44:10 +0100
Subject: [PATCH] fix potential nickname dementia

---
 app/services/discord/index.ts                  | 5 +++++
 app/services/discord/modules/discord-events.ts | 1 +
 2 files changed, 6 insertions(+)

diff --git a/app/services/discord/index.ts b/app/services/discord/index.ts
index 958cb9b6..49d56ac1 100644
--- a/app/services/discord/index.ts
+++ b/app/services/discord/index.ts
@@ -117,6 +117,11 @@ export class DiscordBot extends Service {
 		return true;
 	}
 
+	async getNickname(): Promise<string | undefined> {
+		if (!this.ready || !this.discord.user) return;
+		return (await this.getGuildMember(this.discord.user.id))?.nickname?.split(" ")[0];
+	}
+
 	async setServerBanner(url: string): Promise<void> {
 		if (!this.ready || !(await this.overLvl2())) return;
 		const guild = this.getGuild();
diff --git a/app/services/discord/modules/discord-events.ts b/app/services/discord/modules/discord-events.ts
index 205c965a..66b236cd 100644
--- a/app/services/discord/modules/discord-events.ts
+++ b/app/services/discord/modules/discord-events.ts
@@ -75,6 +75,7 @@ export default (bot: DiscordBot): void => {
 						const path = join(iconsPath, `${icon}.png`);
 						await event.guild?.setIcon(path);
 						await bot.discord.user?.setAvatar(path);
+						data.lastDiscordNickName = (await bot.getNickname()) ?? "Meta";
 						await bot.setNickname(
 							nicks[(Math.random() * nicks.length) | 0],
 							event.name