Add time to breath in CheckExpiredBansTask.kt

Author: WinG4merBR

foxy/src/main/kotlin/net/cakeyfox/foxy/interactions/MessageCommandContext.kt

@@ -54,9 +54,11 @@ class MessageCommandContext(
         }
 
         if (hasTextContent && canSendMessage) {
+            val original = channel.retrieveMessageById(event.messageId).await()
+            if (original.isWebhookMessage) return
+
             channel.sendTyping().queue()
 
-            val original = channel.retrieveMessageById(event.messageId).await()
             val shouldDelete = getGuildData()?.guildSettings?.deleteMessageIfCommandIsExecuted
 
             if (shouldDelete == true) {

foxy/src/main/kotlin/net/cakeyfox/foxy/tasks/CakeInactivityTaxTask.kt

@@ -57,6 +57,11 @@ class CakeInactivityTaxTask(
         users.chunked(10).forEach { chunk ->
             chunk.map { user ->
                 semaphore.withPermit {
+                    if (canBypassInactivityTax(user)) {
+                        logger.info { "Skipping inactive user ${user._id}" }
+                        return@withPermit
+                    }
+
                     try {
                         val lastDaily = user.userCakes.lastDaily?.takeUnless {
                             it == Instant.fromEpochMilliseconds(0)
@@ -76,16 +81,16 @@ class CakeInactivityTaxTask(
                         if (user.userCakes.balance <= MINIMUM_AMOUNT) return@withPermit
 
                         if (daysSinceLastDaily in WARNING_DAYS until TAX_START_DAYS) {
-                            if (canBypassInactivityTax(user)) {
-                                logger.info { "Skipping inactive user ${user._id}" }
-                                return@withPermit
-                            }
-
                             if (user.userCakes.warnedAboutInactivityTax != true) {
                                 val userFromDiscord = foxy.shardManager.retrieveUserById(user._id).await()
                                 foxy.utils.sendDirectMessage(userFromDiscord) {
                                     embed {
-                                        title = pretty(FoxyEmotes.FoxyCry, locale["tax.cakes.warning.title"])
+                                        title = pretty(
+                                            FoxyEmotes.FoxyCry,
+                                            locale[
+                                                "tax.cakes.warning.title"
+                                            ]
+                                        )
                                         description = locale[
                                             "tax.cakes.warning.description",
                                             user._id,

foxy/src/main/kotlin/net/cakeyfox/foxy/tasks/CheckExpiredBansTask.kt

@@ -1,5 +1,6 @@
 package net.cakeyfox.foxy.tasks
 
+import kotlinx.coroutines.delay
 import net.cakeyfox.foxy.FoxyInstance
 import net.cakeyfox.foxy.utils.AdminUtils
 import net.cakeyfox.foxy.utils.ClusterUtils.getClusterByShardId
@@ -19,6 +20,7 @@ class CheckExpiredBansTask(
             val guildShardId = getShardIdFromGuildId(guildId.toLong(), foxy.config.discord.totalShards)
             val guildCluster = getClusterByShardId(foxy, guildShardId)
 
+            delay(500) // Time to breath
             if (guildCluster.id == foxy.currentCluster.id) {
                 AdminUtils.removeExpiredBans(foxy, guildId, expiredBans)
             } else {