feat: birthday upgrades (#69 nice)

* updates

* make user optional

Author: StrangeGirlMurph

package-lock.json

@@ -6,7 +6,7 @@ import {
 } from "discord.js";
 import cron from "node-cron";
 import { Command } from "../interactions/interactionClasses";
-import { myBirthday, setBirthday } from "../util/birthday/manageBirthday";
+import { getBirthday, setBirthday } from "../util/birthday/manageBirthday";
 import { upcomingCommand } from "../util/birthday/upcomingCommand";
 import { birthdayMessageTick } from "../util/birthday/loop";
 import { birthdayDb } from "../db";
@@ -35,8 +35,8 @@ class BirthdayCommand extends Command {
 
 		if (sub == "set") {
 			await setBirthday(interaction);
-		} else if (sub == "my") {
-			await myBirthday(interaction);
+		} else if (sub == "get") {
+			await getBirthday(interaction);
 		} else if (sub == "upcoming") {
 			await upcomingCommand(interaction);
 		}
@@ -66,7 +66,12 @@ class BirthdayCommand extends Command {
 					.addBooleanOption((opt) => opt.setName("delete").setDescription("Delete your birthday entry."))
 			)
 			.addSubcommand((option) =>
-				option.setName("my").setDescription("Show what date is stored for your birthday.")
+				option
+					.setName("get")
+					.setDescription("Show what date is stored for a members birthday. (default: your own)")
+					.addUserOption((opt) =>
+						opt.setName("user").setDescription("The user to get the birthday of.").setRequired(false)
+					)
 			)
 			.addSubcommand((option) =>
 				option.setName("upcoming").setDescription("Lists the upcoming birthdays in the next 30 days.")

src/commands/BirthdayCommand.ts

@@ -19,8 +19,7 @@ export async function birthdayMessageTick(client: Client) {
 			return null;
 		});
 		if (!guildUser) continue;
-		const birthYear = birthdayDb.get(user)!.year;
-		const age = birthYear == 0 ? null : date.year - birthYear;
+		const age = getAge(date);
 		const embed = addEmbedFooter(
 			new EmbedBuilder()
 				.setTitle(`🎉🎊🎆 Happy Birthday ${guildUser.displayName}!!! 🎈🎇🎉`)
@@ -37,3 +36,7 @@ export async function birthdayMessageTick(client: Client) {
 		else logger.warn("Failed to send birthday message because system channel isn't set!");
 	}
 }
+
+export function getAge(date: DateTime): number | null {
+	return date.year == 0 ? null : Math.floor(date.diffNow().as("years") * -1);
+}

src/util/birthday/loop.ts

@@ -2,8 +2,9 @@ import { ChatInputCommandInteraction, inlineCode } from "discord.js";
 import { birthdayDb } from "../../db";
 import { DateTime } from "luxon";
 import { getTimezoneFromRole } from "../misc/role";
-import { longDateFormatWithTimezone } from "../misc/time";
+import { longDateFormatWithTimezone, shortDateFormatWithTimezone } from "../misc/time";
 import { config } from "../../config";
+import { getAge } from "./loop";
 
 export async function setBirthday(interaction: ChatInputCommandInteraction) {
 	const oldDate = birthdayDb.get(interaction.user.id);
@@ -55,9 +56,9 @@ export async function setBirthday(interaction: ChatInputCommandInteraction) {
 
 	if (oldDate) {
 		await interaction.reply({
-			content: `Changed your birthday from *${oldDate.toFormat(
+			content: `Changed your birthday from ${oldDate.toFormat(
 				longDateFormatWithTimezone
-			)}* to **${date.toFormat(longDateFormatWithTimezone)}**!`,
+			)} to **${date.toFormat(longDateFormatWithTimezone)}**!`,
 		});
 	} else {
 		await interaction.reply({
@@ -66,18 +67,36 @@ export async function setBirthday(interaction: ChatInputCommandInteraction) {
 	}
 }
 
-export async function myBirthday(interaction: ChatInputCommandInteraction) {
-	if (!birthdayDb.has(interaction.user.id)) {
+export async function getBirthday(interaction: ChatInputCommandInteraction) {
+	const user = interaction.options.getUser("user") ?? interaction.user;
+	const member = interaction.guild!.members.cache.get(user.id);
+
+	if (!member) {
+		await interaction.reply({
+			content: "This user is not on this server!",
+			ephemeral: true,
+		});
+		return;
+	}
+
+	const isUserItself = interaction.user.id == user.id;
+
+	if (!birthdayDb.has(user.id)) {
 		await interaction.reply({
-			content: "You haven't set your birthday yet!\nYou can do this by using `/birthday set`",
+			content: isUserItself
+				? "You don't have a birthday set yet!\nYou can set it with `/birthday set`!"
+				: `${member.displayName} hasn't set their birthday yet!`,
 			ephemeral: true,
 		});
 		return;
 	}
 
-	const date = birthdayDb.get(interaction.user.id)!;
+	const date = birthdayDb.get(user.id)!;
+	const age = getAge(date);
 
 	await interaction.reply({
-		content: `Your birthday is set for the **${date.toFormat(longDateFormatWithTimezone)}**!`,
+		content: `${isUserItself ? "Your" : member.displayName + "s"} birthday is set for the ${date.toFormat(
+			age != null ? longDateFormatWithTimezone : shortDateFormatWithTimezone
+		)}!${age != null ? ` That means ${isUserItself ? "you" : "they"} are ${age} years old!` : ""}`,
 	});
 }

src/util/birthday/manageBirthday.ts

@@ -2,7 +2,8 @@ import { ChatInputCommandInteraction, EmbedBuilder } from "discord.js";
 import { birthdayDb } from "../../db";
 import { addEmbedColor } from "../misc/embeds";
 import { DateTime } from "luxon";
-import { longDateFormatWithTimezone } from "../misc/time";
+import { longDateFormatWithTimezone, shortDateFormatWithTimezone } from "../misc/time";
+import { getAge } from "./loop";
 
 export async function upcomingCommand(interaction: ChatInputCommandInteraction) {
 	const now = DateTime.now();
@@ -24,9 +25,12 @@ export async function upcomingCommand(interaction: ChatInputCommandInteraction)
 			return daysA - daysB;
 		});
 
-	const answer = entries.map(
-		(entry) => `${entry.date.toFormat(longDateFormatWithTimezone)} ⁘ <@${entry.user}>`
-	);
+	const answer = entries.map((entry) => {
+		const age = getAge(entry.date);
+		return `${entry.date.toFormat(
+			entry.date.year != 0 ? longDateFormatWithTimezone : shortDateFormatWithTimezone
+		)}${age ? ` (${age + 1}th)` : ""} ⁘ <@${entry.user}>`;
+	});
 
 	if (entries.length == 0) {
 		const embed = new EmbedBuilder()

src/util/birthday/upcomingCommand.ts

@@ -18,6 +18,7 @@ export function durationToReadable(duration: Duration, short = false): string {
 }
 
 export const longDateFormatWithTimezone = "dd MMMM yyyy 'UTC'Z";
+export const shortDateFormatWithTimezone = "dd MMMM 'UTC'Z";
 export const longDateTimeFormat = "dd.MM.yyyy HH:mm:ss 'UTC'Z";
 export const shortDateTimeFormat = "dd.MM.yyyy HH:mm 'UTC'Z";
 export const longTimeFormat = "HH:mm:ss 'UTC'Z";