From b2587470862e25e3738e84310960cba82acb5078 Mon Sep 17 00:00:00 2001 From: moonleay Date: Wed, 6 Sep 2023 21:59:41 +0200 Subject: [PATCH 1/6] chore: improved imports Signed-off-by: moonleay --- src/main/kotlin/net/moonleay/lilJudd/Bot.kt | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/main/kotlin/net/moonleay/lilJudd/Bot.kt b/src/main/kotlin/net/moonleay/lilJudd/Bot.kt index be764de..1c6e337 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/Bot.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/Bot.kt @@ -35,10 +35,7 @@ import net.moonleay.botendo.build.BuildConstants import net.moonleay.lilJudd.buttons.component.EditButtonManager import net.moonleay.lilJudd.data.CredentialManager import net.moonleay.lilJudd.data.DB -import net.moonleay.lilJudd.extensions.FeatureManageExtension -import net.moonleay.lilJudd.extensions.MatchExtension -import net.moonleay.lilJudd.extensions.SendPlannerExtension -import net.moonleay.lilJudd.extensions.VersionExtension +import net.moonleay.lilJudd.extensions.* import net.moonleay.lilJudd.features.AvailabilityManager import net.moonleay.lilJudd.features.MatchManager import net.moonleay.lilJudd.features.TimeManager @@ -103,7 +100,7 @@ object Bot { add(::FeatureManageExtension) add(::SendPlannerExtension) add(::MatchExtension) - //add(::UpdateRolesExtension) // This command is only for debugging purposes + add(::UpdateRolesExtension) // This command is only for debugging purposes //add(::TestExtension) // See comment in TestExtension.kt } From 925398db650de3680cf566ddf9bb976f0c3b735e Mon Sep 17 00:00:00 2001 From: moonleay Date: Wed, 6 Sep 2023 22:03:50 +0200 Subject: [PATCH 2/6] fix: fixed weekstamp Signed-off-by: moonleay --- src/main/kotlin/net/moonleay/lilJudd/features/TimeManager.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/kotlin/net/moonleay/lilJudd/features/TimeManager.kt b/src/main/kotlin/net/moonleay/lilJudd/features/TimeManager.kt index 0ac7b1b..9acbc33 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/features/TimeManager.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/features/TimeManager.kt @@ -94,6 +94,7 @@ object TimeManager : IFeature { if (Bot.bot.kordRef.getChannel(ch) == null) continue // TODO: Check if the channel is valid in another shard val c = Bot.bot.kordRef.getChannelOf(ch)!! + msgStr = "" if (roleMap != null && roleMap.keys.contains(ch) && roleMap[ch] != null) { c.createMessage { this.content = @@ -152,7 +153,7 @@ object TimeManager : IFeature { TimePlanningMessages.insert { it[TimePlanningMessages.serverid] = c.data.guildId.value.toString() it[TimePlanningMessages.channelid] = c.id.value.toString() - it[TimePlanningMessages.weekstamp] = TimeUtil.getWeekStamp().toOffsetDateTime().toString() + it[TimePlanningMessages.weekstamp] = (TimeUtil.getWeekStamp().toEpochSecond() * 1000).toString() it[TimePlanningMessages.messageids] = msgStr } get TimePlanningMessages.id } From d10f8901c98b2ca14607c700d8a38134c3d84706 Mon Sep 17 00:00:00 2001 From: moonleay Date: Wed, 6 Sep 2023 22:05:29 +0200 Subject: [PATCH 3/6] fix: fixed AvailabilityManager Signed-off-by: moonleay --- .../moonleay/lilJudd/features/AvailabilityManager.kt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/kotlin/net/moonleay/lilJudd/features/AvailabilityManager.kt b/src/main/kotlin/net/moonleay/lilJudd/features/AvailabilityManager.kt index 1359f50..2a980dc 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/features/AvailabilityManager.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/features/AvailabilityManager.kt @@ -96,8 +96,8 @@ object AvailabilityManager : IFeature { } val roleData = roleMap[data.channelid] // Get the role data if (roleData == null) { - Logger.out("Role for this channel does not exist") - return + Logger.out("Role for channel ${data.channelid} does not exist") + continue // this took way to long to find out that this was the issue } val g = Bot.bot.kordRef.getGuildOrThrow(Snowflake(data.serverid)) // Get all members with the role @@ -106,9 +106,11 @@ object AvailabilityManager : IFeature { } mce.collect { memberchunkevent -> memberchunkevent.members.forEach { - Logger.out("Checking member ${it.id.value}") - if (it.roleIds.contains(Snowflake(roleData.hastimeroleid))) + Logger.out("Checking member ${it.id.value} (${it.username})") + if (it.roleIds.contains(Snowflake(roleData.hastimeroleid))) { it.removeRole(Snowflake(roleData.hastimeroleid)) + Logger.out("Removed role from ${it.username}") // Removed the role + } } } From f552ea4faaa0560fbc24e8bd577ed7c920c529bb Mon Sep 17 00:00:00 2001 From: moonleay Date: Wed, 6 Sep 2023 22:06:14 +0200 Subject: [PATCH 4/6] chore: improved readability Signed-off-by: moonleay --- .../moonleay/lilJudd/extensions/SendPlannerExtension.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/kotlin/net/moonleay/lilJudd/extensions/SendPlannerExtension.kt b/src/main/kotlin/net/moonleay/lilJudd/extensions/SendPlannerExtension.kt index 2a56745..c02294e 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/extensions/SendPlannerExtension.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/extensions/SendPlannerExtension.kt @@ -107,10 +107,10 @@ class SendPlannerExtension : Extension() { // Save the message ids transaction { TimePlanningMessages.insert { - it[serverid] = c.data.guildId.value.toString() - it[channelid] = c.id.value.toString() - it[weekstamp] = (TimeUtil.getWeekStamp().toEpochSecond() * 1000).toString() - it[messageids] = msgStr + it[TimePlanningMessages.serverid] = c.data.guildId.value.toString() + it[TimePlanningMessages.channelid] = c.id.value.toString() + it[TimePlanningMessages.weekstamp] = (TimeUtil.getWeekStamp().toEpochSecond() * 1000).toString() + it[TimePlanningMessages.messageids] = msgStr } get TimePlanningMessages.id } Logger.out("Finished with ${c.data.guildId.value}") From a3c1344f1adfec7b775abd1c949c4ce48972644c Mon Sep 17 00:00:00 2001 From: moonleay Date: Wed, 6 Sep 2023 22:09:59 +0200 Subject: [PATCH 5/6] feat: Roles now update on button press Signed-off-by: moonleay --- .../lilJudd/buttons/timeplanner/IsAvailableEditButton.kt | 2 ++ .../lilJudd/buttons/timeplanner/MaybeAvailableEditButton.kt | 2 ++ .../lilJudd/buttons/timeplanner/NotAvailableEditButton.kt | 2 ++ 3 files changed, 6 insertions(+) diff --git a/src/main/kotlin/net/moonleay/lilJudd/buttons/timeplanner/IsAvailableEditButton.kt b/src/main/kotlin/net/moonleay/lilJudd/buttons/timeplanner/IsAvailableEditButton.kt index 2acfe55..6140d4d 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/buttons/timeplanner/IsAvailableEditButton.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/buttons/timeplanner/IsAvailableEditButton.kt @@ -27,6 +27,7 @@ import dev.kord.core.entity.interaction.ButtonInteraction import dev.kord.rest.builder.message.modify.embed import net.moonleay.lilJudd.Bot import net.moonleay.lilJudd.buttons.component.IEditButton +import net.moonleay.lilJudd.features.AvailabilityManager import net.moonleay.lilJudd.util.EmbedUtil class IsAvailableEditButton : IEditButton { @@ -62,5 +63,6 @@ class IsAvailableEditButton : IEditButton { } } } + AvailabilityManager.runThread() } } diff --git a/src/main/kotlin/net/moonleay/lilJudd/buttons/timeplanner/MaybeAvailableEditButton.kt b/src/main/kotlin/net/moonleay/lilJudd/buttons/timeplanner/MaybeAvailableEditButton.kt index 3696a54..c3eaec2 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/buttons/timeplanner/MaybeAvailableEditButton.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/buttons/timeplanner/MaybeAvailableEditButton.kt @@ -27,6 +27,7 @@ import dev.kord.core.entity.interaction.ButtonInteraction import dev.kord.rest.builder.message.modify.embed import net.moonleay.lilJudd.Bot import net.moonleay.lilJudd.buttons.component.IEditButton +import net.moonleay.lilJudd.features.AvailabilityManager import net.moonleay.lilJudd.util.EmbedUtil class MaybeAvailableEditButton : IEditButton { @@ -62,5 +63,6 @@ class MaybeAvailableEditButton : IEditButton { } } } + AvailabilityManager.runThread() } } diff --git a/src/main/kotlin/net/moonleay/lilJudd/buttons/timeplanner/NotAvailableEditButton.kt b/src/main/kotlin/net/moonleay/lilJudd/buttons/timeplanner/NotAvailableEditButton.kt index 698993f..b56db11 100644 --- a/src/main/kotlin/net/moonleay/lilJudd/buttons/timeplanner/NotAvailableEditButton.kt +++ b/src/main/kotlin/net/moonleay/lilJudd/buttons/timeplanner/NotAvailableEditButton.kt @@ -27,6 +27,7 @@ import dev.kord.core.entity.interaction.ButtonInteraction import dev.kord.rest.builder.message.modify.embed import net.moonleay.lilJudd.Bot import net.moonleay.lilJudd.buttons.component.IEditButton +import net.moonleay.lilJudd.features.AvailabilityManager import net.moonleay.lilJudd.util.EmbedUtil class NotAvailableEditButton : IEditButton { @@ -62,5 +63,6 @@ class NotAvailableEditButton : IEditButton { } } } + AvailabilityManager.runThread() } } From 18cd26c45681001527dbb6446a5e5f4677db48c6 Mon Sep 17 00:00:00 2001 From: moonleay Date: Wed, 6 Sep 2023 22:10:17 +0200 Subject: [PATCH 6/6] chore: bump version Signed-off-by: moonleay --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index f62ca80..3292b17 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -32,7 +32,7 @@ val ownerID = 372703841151614976L group = "net.moonleay.liljudd" version = System.getenv("CI_COMMIT_TAG")?.let { "$it-${System.getenv("CI_COMMIT_SHORT_SHA")}-prod" } ?: System.getenv("CI_COMMIT_SHORT_SHA")?.let { "$it-dev" } - ?: "2.4.2" + ?: "2.4.3" val kordver = "1.5.6" val coroutinesver = "1.1.0"