closes wwosimulation/tracker/issues/583

wwosimulation · Sep 11, 2022 · 44b7aed · 44b7aed
1 parent 3aac3a2
commit 44b7aed
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/commands/narrator/bye.js b/commands/narrator/bye.js
@@ -1,24 +1,23 @@
 const { ids, fn } = require("../../config")
-const db = require("quick.db")
 
 module.exports = {
     name: "bye",
-    description: "Clean the game server.",
+    description: "Kick all players and spectators.",
     usage: `${process.env.PREFIX}bye`,
     gameOnly: true,
     narratorOnly: true,
     run: async (message, args, client) => {
-        kick(message)
+        kick(client)
         let m = await message.channel.send("Players have been kicked, I am now ending the game and deleting the role .")
         await fn.sleep(3000)
         await clearJoin(client)
         await m.edit("Game end complete!").catch(() => {})
-        await message.guild.channels.cache.find((c) => c.name === "carl-welcome-left-log")?.send("== Game End ==")
+        await client.guilds.cache.get(ids.server.game).channels.cache.find((c) => c.name === "carl-welcome-left-log")?.send("== Game End ==")
     },
 }
 
-const kick = (message) => {
-    message.guild.members.cache.forEach((e) => {
+const kick = (client) => {
+    client.guilds.cache.get(ids.server.game).members.cache.forEach((e) => {
         if (!e.permissions.any(["MANAGE_CHANNELS", "ADMINISTRATOR", "MANAGE_ROLES"])) {
             e.kick("Game end")
             console.log(`Kicked ${e.user.tag}`)

diff --git a/commands/narrator/cancel.js b/commands/narrator/cancel.js
@@ -11,10 +11,6 @@ module.exports = {
         let server = client.guilds.cache.get(ids.server.sim)
 
         server.channels.cache.find((c) => c.name === "game-announcements").send(`Game was canceled. Sorry for the inconvenience!`)
-        let t = server.roles.cache.get(ids.server.sim).members
-        t.forEach((e) => {
-            e.roles.remove("606123676668133428") //joining role
-        })
         let mid = db.get("game.id")
         server.channels.cache
             .get("606123818305585167") //game warning
@@ -23,6 +19,7 @@ module.exports = {
                 m.edit(fn.disableButtons(m))
             })
         db.delete(`game`)
+        client.commands.get("bye").run(message, args, client)
         client.guilds.cache
             .get(ids.server.game)
             .channels.cache.find((c) => c.name === "carl-welcome-left-log")