From c7a9345359159c47820f9a21fff25508ea3d95a8 Mon Sep 17 00:00:00 2001 From: WeslayCodes <60010287+WeslayCodes@users.noreply.github.com> Date: Mon, 30 Jun 2025 16:48:34 -0500 Subject: [PATCH 1/2] Add anniversary logic --- src/main/java/dev/boarbot/commands/boar/DailySubcommand.java | 4 ++++ src/main/java/dev/boarbot/util/time/TimeUtil.java | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/src/main/java/dev/boarbot/commands/boar/DailySubcommand.java b/src/main/java/dev/boarbot/commands/boar/DailySubcommand.java index a746f44..83d46c0 100644 --- a/src/main/java/dev/boarbot/commands/boar/DailySubcommand.java +++ b/src/main/java/dev/boarbot/commands/boar/DailySubcommand.java @@ -144,6 +144,10 @@ public void doSynchronizedAction(BoarUser boarUser) { ); this.boarIDs = BoarUtil.getRandBoarIDs(blessings, isSkyblockGuild); + if (TimeUtil.isAnniversary()) { + this.boarIDs.add("birthday"); + } + boarUser.boarQuery().addBoars( this.boarIDs, connection, diff --git a/src/main/java/dev/boarbot/util/time/TimeUtil.java b/src/main/java/dev/boarbot/util/time/TimeUtil.java index 54ce8b5..3626f96 100644 --- a/src/main/java/dev/boarbot/util/time/TimeUtil.java +++ b/src/main/java/dev/boarbot/util/time/TimeUtil.java @@ -100,6 +100,10 @@ private static boolean isEaster(LocalDate date) { return (month == easterMonth && day == easterDay) || (month == nextMonth && day == nextDay); } + public static boolean isAnniversary() { + return LocalDate.now(ZoneOffset.UTC).getMonth() == Month.JULY && getDayOfMonth() == 1; + } + public static int getDayOfMonth() { return LocalDate.now(ZoneOffset.UTC).getDayOfMonth(); } From 3ff37bf096450783b4f85e5cdf1d4b09ec764b54 Mon Sep 17 00:00:00 2001 From: WeslayCodes <60010287+WeslayCodes@users.noreply.github.com> Date: Mon, 30 Jun 2025 16:51:28 -0500 Subject: [PATCH 2/2] Make birthday boar first boar --- src/main/java/dev/boarbot/commands/boar/DailySubcommand.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/dev/boarbot/commands/boar/DailySubcommand.java b/src/main/java/dev/boarbot/commands/boar/DailySubcommand.java index 83d46c0..3241ee4 100644 --- a/src/main/java/dev/boarbot/commands/boar/DailySubcommand.java +++ b/src/main/java/dev/boarbot/commands/boar/DailySubcommand.java @@ -142,12 +142,13 @@ public void doSynchronizedAction(BoarUser boarUser) { boolean isSkyblockGuild = GuildDataUtil.isSkyblockGuild( connection, Objects.requireNonNull(this.interaction.getGuild()).getId() ); - this.boarIDs = BoarUtil.getRandBoarIDs(blessings, isSkyblockGuild); if (TimeUtil.isAnniversary()) { this.boarIDs.add("birthday"); } + this.boarIDs = BoarUtil.getRandBoarIDs(blessings, isSkyblockGuild); + boarUser.boarQuery().addBoars( this.boarIDs, connection,