fix bans not dispatching properly

98ping · Apr 8, 2023 · 9a5f6f0 · 9a5f6f0
1 parent 6744f33
commit 9a5f6f0
Show file tree

Hide file tree

Showing 11 changed files with 50 additions and 5 deletions.
diff --git a/.gradle/7.1/dependencies-accessors/dependencies-accessors.lock b/.gradle/7.1/dependencies-accessors/dependencies-accessors.lock
diff --git a/.gradle/7.1/executionHistory/executionHistory.bin b/.gradle/7.1/executionHistory/executionHistory.bin
diff --git a/.gradle/7.1/executionHistory/executionHistory.lock b/.gradle/7.1/executionHistory/executionHistory.lock
diff --git a/.gradle/7.1/fileHashes/fileHashes.bin b/.gradle/7.1/fileHashes/fileHashes.bin
diff --git a/.gradle/7.1/fileHashes/fileHashes.lock b/.gradle/7.1/fileHashes/fileHashes.lock
diff --git a/.gradle/7.1/fileHashes/resourceHashesCache.bin b/.gradle/7.1/fileHashes/resourceHashesCache.bin
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin
diff --git a/.gradle/checksums/sha1-checksums.bin b/.gradle/checksums/sha1-checksums.bin
diff --git a/.idea/codestream.xml b/.idea/codestream.xml
diff --git a/...src/main/kotlin/ltd/matrixstudios/alchemist/punishment/packets/PunishmentExecutePacket.kt b/...src/main/kotlin/ltd/matrixstudios/alchemist/punishment/packets/PunishmentExecutePacket.kt
@@ -1,10 +1,13 @@
 package ltd.matrixstudios.alchemist.punishment.packets
 
 import ltd.matrixstudios.alchemist.AlchemistSpigotPlugin
+import ltd.matrixstudios.alchemist.api.AlchemistAPI
 import ltd.matrixstudios.alchemist.punishments.PunishmentType
 import ltd.matrixstudios.alchemist.redis.RedisPacket
 import ltd.matrixstudios.alchemist.util.Chat
+import ltd.matrixstudios.alchemist.util.TimeUtil
 import org.bukkit.Bukkit
+import org.bukkit.event.player.AsyncPlayerPreLoginEvent
 import java.util.*
 
 class PunishmentExecutePacket(
@@ -18,13 +21,55 @@ class PunishmentExecutePacket(
 
         if (player != null) {
             if (punishmentType == PunishmentType.BLACKLIST) {
-                AlchemistSpigotPlugin.instance.config.getStringList("blacklist-message").map { it.replace("<reason>", reason)}.forEach { player.sendMessage(Chat.format(it)) }
+                AlchemistSpigotPlugin.instance.config.getStringList("blacklist-message")
+                    .map { it.replace("<reason>", reason) }.forEach { player.sendMessage(Chat.format(it)) }
             } else if (punishmentType == PunishmentType.BAN) {
-                AlchemistSpigotPlugin.instance.config.getStringList("ban-message").map { it.replace("<reason>", reason)}.forEach { player.sendMessage(Chat.format(it)) }
+                AlchemistSpigotPlugin.instance.config.getStringList("ban-message")
+                    .map { it.replace("<reason>", reason) }.forEach { player.sendMessage(Chat.format(it)) }
             } else if (punishmentType == PunishmentType.MUTE) {
-                AlchemistSpigotPlugin.instance.config.getStringList("mute-message").map { it.replace("<reason>", reason)}.forEach { player.sendMessage(Chat.format(it)) }
+                AlchemistSpigotPlugin.instance.config.getStringList("mute-message")
+                    .map { it.replace("<reason>", reason) }.forEach { player.sendMessage(Chat.format(it)) }
             } else if (punishmentType == PunishmentType.WARN) {
-                AlchemistSpigotPlugin.instance.config.getStringList("warn-message").map { it.replace("<reason>", reason)}.forEach { player.sendMessage(Chat.format(it)) }
+                AlchemistSpigotPlugin.instance.config.getStringList("warn-message")
+                    .map { it.replace("<reason>", reason) }.forEach { player.sendMessage(Chat.format(it)) }
+            }
+
+            if (punishmentType == PunishmentType.BAN) {
+
+                val profile = AlchemistAPI.syncFindProfile(target) ?: return
+                val punishment = profile.getActivePunishments(PunishmentType.BAN).firstOrNull()
+                val msgs = AlchemistSpigotPlugin.instance.config.getStringList("banned-join")
+
+                msgs.replaceAll { it.replace("<reason>", punishment!!.reason) }
+                msgs.replaceAll {
+                    it.replace(
+                        "<expires>",
+                        if (punishment!!.expirable.duration == Long.MAX_VALUE) "Never" else TimeUtil.formatDuration(
+                            punishment.expirable.addedAt + punishment.expirable.duration - System.currentTimeMillis()
+                        )
+                    )
+                }
+
+                player.kickPlayer(msgs.map { Chat.format(it) }.joinToString("\n"))
+            } else if (punishmentType == PunishmentType.BLACKLIST) {
+                val profile = AlchemistAPI.syncFindProfile(target) ?: return
+                val punishments = profile.getActivePunishments(PunishmentType.BLACKLIST).toMutableList()
+                punishments.addAll(profile.getActivePunishments(PunishmentType.BAN))
+
+                val punishment = profile.getActivePunishments(PunishmentType.BLACKLIST).firstOrNull()
+                val msgs = AlchemistSpigotPlugin.instance.config.getStringList("blacklisted-join")
+
+                msgs.replaceAll { it.replace("<reason>", punishment!!.reason) }
+                msgs.replaceAll {
+                    it.replace(
+                        "<expires>",
+                        if (punishment!!.expirable.duration == Long.MAX_VALUE) "Never" else TimeUtil.formatDuration(
+                            punishment.expirable.addedAt + punishment.expirable.duration - System.currentTimeMillis()
+                        )
+                    )
+                }
+
+                player.kickPlayer(msgs.map { Chat.format(it) }.joinToString("\n"))
             }
         }
     }