Refactor bearweek command

mrwhale-io · Nov 27, 2023 · a9983a2 · a9983a2
1 parent a3277e4
commit a9983a2
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 14 deletions.
diff --git a/packages/mrwhale-commands/src/commands/useful/bearweek.ts b/packages/mrwhale-commands/src/commands/useful/bearweek.ts
@@ -8,26 +8,43 @@ export const data: CommandOptions = {
 };
 
 const AUGUST = 8;
+const BEAR_WEEK_START_DAY = 11;
+const BEAR_WEEK_END_DAY = 18;
 
 export function action(): string {
   const now = new Date();
   const currentMonth = now.getMonth() + 1;
-
   const currentDay = now.getDate();
-  let nextBearWeekYear = now.getFullYear();
-  if (now >= new Date(`${nextBearWeekYear}-08-19T00:00:00.000Z`)) {
-    nextBearWeekYear++;
-  }
-
-  const nextBearWeekDate = `${nextBearWeekYear}-08-11T00:00:00.000Z`;
-  const bearWeek = new Date(nextBearWeekDate);
+
+  const nextBearWeekYear = getBearWeekYear(now);
+  const nextBearWeekDate = getBearWeekDate(nextBearWeekYear);
 
-  const ms = Math.floor(bearWeek.valueOf() - now.valueOf());
+  const ms = Math.floor(nextBearWeekDate.valueOf() - now.valueOf());
   const time = TimeUtilities.convertMs(ms);
 
-  if (currentMonth === AUGUST && currentDay <= 18 && currentDay >= 11) {
+  if (
+    currentMonth === AUGUST &&
+    currentDay >= BEAR_WEEK_START_DAY &&
+    currentDay <= BEAR_WEEK_END_DAY
+  ) {
     return `It is Bear week! 🐻 Visit https://mudgolt.com/`;
   }
 
   return `${time.toString()} until bear week! 🐻`;
 }
+
+export function getBearWeekYear(now: Date): number {
+  const nextBearWeekYear = now.getFullYear();
+  const nextBearWeekDate = getBearWeekDate(nextBearWeekYear);
+  if (now >= nextBearWeekDate) {
+    return nextBearWeekYear + 1;
+  }
+
+  return nextBearWeekYear;
+}
+
+function getBearWeekDate(bearWeekYear: number): Date {
+  return new Date(
+    `${bearWeekYear}-0${AUGUST}-${BEAR_WEEK_START_DAY}T00:00:00.000Z`
+  );
+}
diff --git a/packages/mrwhale-discord/src/commands/useful/bearweek.ts b/packages/mrwhale-discord/src/commands/useful/bearweek.ts
@@ -30,10 +30,7 @@ export default class extends DiscordCommand {
     interaction: ChatInputCommandInteraction | Message
   ): Promise<Message<boolean>> | Promise<InteractionResponse<boolean>> {
     const now = new Date();
-    let nextBearWeekYear = now.getFullYear();
-    if (now >= new Date(`${nextBearWeekYear}-08-19T00:00:00.000Z`)) {
-      nextBearWeekYear++;
-    }
+    const nextBearWeekYear = bearweek.getBearWeekYear(now);
 
     const embed = new EmbedBuilder()
       .setTitle(`Bear week ${nextBearWeekYear} countdown!`)