From cf1e96a1ac21d8bcb859197acde3346d1697509b Mon Sep 17 00:00:00 2001
From: Tarrgon <61888458+Tarrgon@users.noreply.github.com>
Date: Fri, 30 May 2025 12:43:27 -0400
Subject: [PATCH] Kick instead of ban

---
 src/shared/RedisClient.ts | 41 ++++++++++++++++++++++++++-------------
 1 file changed, 27 insertions(+), 14 deletions(-)

diff --git a/src/shared/RedisClient.ts b/src/shared/RedisClient.ts
index ab8dbed..81ec78f 100644
--- a/src/shared/RedisClient.ts
+++ b/src/shared/RedisClient.ts
@@ -37,33 +37,46 @@ async function banUpdateHandler(update: string) {
   const data: BanUpdate = JSON.parse(update);
 
   if (data.action == 'create') {
-    banDiscordAccounts(data);
-  } else if (data.action == 'delete') {
-    unbanDiscordAccounts(data);
+    kickDiscordAccounts(data);
   }
+  // else if (data.action == 'delete') {
+  //   // unbanDiscordAccounts(data);
+  // }
 }
 
-async function banDiscordAccounts(data: BanUpdate) {
+async function kickDiscordAccounts(data: BanUpdate) {
   const guild = await discordClient.guilds.fetch(config.DISCORD_GUILD_ID!);
 
   const discordIds = await Database.getDiscordIds(data.ban.user_id);
 
   for (const id of discordIds) {
-    await guild.bans.create(id, {
-      reason: data.ban.reason
-    });
+    const member = await guild.members.fetch(id);
+
+    if (member) await member.kick(data.ban.reason);
   }
 }
 
-async function unbanDiscordAccounts(data: BanUpdate) {
-  const guild = await discordClient.guilds.fetch(config.DISCORD_GUILD_ID!);
+// async function banDiscordAccounts(data: BanUpdate) {
+//   const guild = await discordClient.guilds.fetch(config.DISCORD_GUILD_ID!);
 
-  const discordIds = await Database.getDiscordIds(data.ban.user_id);
+//   const discordIds = await Database.getDiscordIds(data.ban.user_id);
 
-  for (const id of discordIds) {
-    await guild.bans.remove(id);
-  }
-}
+//   for (const id of discordIds) {
+//     await guild.bans.create(id, {
+//       reason: data.ban.reason
+//     });
+//   }
+// }
+
+// async function unbanDiscordAccounts(data: BanUpdate) {
+//   const guild = await discordClient.guilds.fetch(config.DISCORD_GUILD_ID!);
+
+//   const discordIds = await Database.getDiscordIds(data.ban.user_id);
+
+//   for (const id of discordIds) {
+//     await guild.bans.remove(id);
+//   }
+// }
 
 async function ticketUpdateHandler(update: string) {
   const data: TicketUpdate = JSON.parse(update);