Merge pull request #158 from oof2win2/bugfix/rcon

Author: oof2win2

src/base/Comfy.ts

@@ -78,7 +78,7 @@ class Comfy extends Client {
       });
     });
     setInterval(() => {
-      this.serverQueues.forEach((server) => {
+      this.serverQueues.forEach(async (server) => {
         if (server.sendingMessage === true) return;
         server.sendingMessage = true;
         let message = "";
@@ -98,7 +98,7 @@ class Comfy extends Client {
           }
         }
         if (message.length) {
-          const channel = this.channels.cache.get(server.server.discordid);
+          const channel = await this.channels.fetch(server.server.discordid);
           if (channel.isText())
             channel.send(message).then(() => (server.sendingMessage = false));
         } else {

src/commands/Factorio/getroles.ts

@@ -23,7 +23,7 @@ const Getroles: Command<Message> = {
     const id =
       message.mentions.users.first()?.id || args[0] || message.author.id;
     const user = await client.findOrCreateUser({ id: id });
-    if (user.factorioRoles === [])
+    if (user.factorioRoles.length === 0)
       return message.channel.send(`User has no roles!`);
     else
       message.channel.send(

src/commands/Factorio/onlineplayers.ts

@@ -24,28 +24,28 @@ const OnlinePlayers: Command<Message> = {
     const serversWithScenario = rcon.rconConnections
       .filter((connection) => connection.hasScenario)
       .filter((connection) => connection.server.hidden === false)
-      .map((connection) => connection.server.discordname);
+      .map((connection) => connection.server.name);
     const serversWithoutScenario = rcon.rconConnections
       .filter((connection) => !connection.hasScenario)
       .filter((connection) => connection.server.hidden === false)
-      .map((connection) => connection.server.discordname);
+      .map((connection) => connection.server.name);
 
-    const scenarioOutputProm = serversWithScenario.map((discordname) =>
+    const scenarioOutputProm = serversWithScenario.map((name) =>
       rcon.rconCommand(
         "/interface t = {}; for _, player in ipairs(game.connected_players) do t[player.name] = Roles.get_player_highest_role(player).name end; rcon.print(game.table_to_json(t))",
-        discordname
+        name
       )
     );
     const withoutScenarioOutputProm = serversWithoutScenario.map(
-      (discordname) => rcon.rconCommand("/p o", discordname)
+      (name) => rcon.rconCommand("/p o", name)
     );
     const scenarioOutput = await Promise.all(scenarioOutputProm);
     const withoutScenarioOutput = await Promise.all(withoutScenarioOutputProm);
 
     scenarioOutput.forEach((response) => {
       if (!response.resp)
         return embed.addField(
-          response.server.discordname,
+			response.resp != false ? response.server.discordname : response.identifier,
           "Server is unreachable"
         );
       const playerRoles = JSON.parse(
@@ -63,7 +63,7 @@ const OnlinePlayers: Command<Message> = {
     withoutScenarioOutput.forEach((response) => {
       if (!response.resp || typeof response.resp !== "string")
         return embed.addField(
-          response.server.discordname,
+			response.resp != false ? response.server.discordname : response.identifier,
           "Server is unreachable"
         );
       const players = response.resp

src/commands/Moderation/rconcmdall.ts

@@ -41,9 +41,9 @@ const RconcmdAll: Command<Message> = {
         if (out.resp && out.resp.length > 1024)
           throw Error("Response too long!");
         else
-          outEmbed.addField(`${out.server.discordname}`, out.resp.toString());
+          outEmbed.addField(`${out.resp != false ? out.server.discordname : out.identifier}`, out.resp.toString());
       } catch (error) {
-        outEmbed.addField(`${out.server.discordname}`, error);
+        outEmbed.addField(`${out.resp != false ? out.server.discordname : out.identifier}`, error);
         console.error(error);
       }
     });

src/events/guild/guildMemberUpdate.ts

@@ -30,12 +30,10 @@ export default async (
 
     Object.keys(client.config.factorioRoles).map((name) => {
       const role = client.config.factorioRoles[name];
-      console.log(role);
       if (shouldHaveRoleIDs.includes(role.id)) factorioRoles.push(role.name);
     });
     user.factorioRoles.forEach((role) => {
       if (!factorioRoles.includes(role)) {
-        console.log(role);
         rolesToUnassign.push(role);
       }
     });
@@ -51,8 +49,9 @@ export default async (
     }
     factorioRoles.forEach((role) => {
       rcon.rconCommandAll(
-        `/interface Roles.assign_player('${user.factorioName}', '${role}', "JammyBot")`
+        `/interface Roles.assign_player('${user.factorioName}', '${role}', "JammyBot", true)`
       );
     });
+	await user.save()
   }
 };

src/helpers/rcon.ts

@@ -18,7 +18,7 @@ interface RCONCommandSuccessOutput {
 }
 interface RCONCommandFailOutput {
   resp: false;
-  server: FactorioServer;
+  identifier: string;
 }
 type RCONCommandOutput = RCONCommandSuccessOutput | RCONCommandFailOutput;
 
@@ -30,7 +30,7 @@ interface Connection {
 
 class RconInterface {
   private servers: FactorioServer[];
-  private client: Comfy | null;
+  public client: Comfy | null;
   public rconConnections: Connection[];
   /**
    * Intervals of checking if a server is online
@@ -67,24 +67,28 @@ class RconInterface {
       // reconnection mechanism
       rcon.on("end", () => {
         this.reconnectRcon(rcon, server); // start the reconnection mechanism
-        this.client.sendToErrorChannel(
-          `Server <#${
-            server.discordid
-          }> has dropped connection to RCON at <t:${Math.floor(
-            Date.now() / 1000
-          )}>`
-        );
+       if (!server.dev) {
+		this.client.sendToErrorChannel(
+			`Server <#${
+			  server.discordid
+			}> has dropped connection to RCON at <t:${Math.floor(
+			  Date.now() / 1000
+			)}>`
+		  );
+	   }
       });
     } catch (error) {
       // mechanism to reconnect to RCON after some time
       this.reconnectRcon(rcon, server); // start the reconnection mechanism
-      this.client.sendToErrorChannel(
-        `Server <#${
-          server.discordid
-        }> has failed to initially connect to RCON at <t:${Math.floor(
-          Date.now() / 1000
-        )}>`
-      );
+      if (!server.dev) {
+		this.client.sendToErrorChannel(
+			`Server <#${
+			  server.discordid
+			}> has failed to initially connect to RCON at <t:${Math.floor(
+			  Date.now() / 1000
+			)}>`
+		  );
+	  }
     }
   }
 
@@ -124,13 +128,15 @@ class RconInterface {
         if (connectionAttempts === 11520) connectionAttempts = 5760;
         // dayjs is used to get the relative time since the start of the reconnection attempts
         if (attempts.includes(connectionAttempts)) {
-          this.client.sendToErrorChannel(
-            `Server <#${
-              server.discordid
-            }> has been unable to connect to RCON since ${dayjs(
-              startedAt
-            ).fromNow()}`
-          );
+          if (!server.dev) {
+			this.client.sendToErrorChannel(
+				`Server <#${
+				  server.discordid
+				}> has dropped connection to RCON at <t:${Math.floor(
+				  Date.now() / 1000
+				)}>`
+			  );
+		  }
         }
       }
     };
@@ -153,17 +159,19 @@ class RconInterface {
         s.server.name === serverIdentifier ||
         s.server.discordid === serverIdentifier
     );
+	// if (serverIdentifier == "724696348871622818")
+	// 	console.log(server)
     if (!server)
       return {
         resp: false,
-        server: server.server,
+		identifier: serverIdentifier,
       };
     // eslint-disable-next-line @typescript-eslint/no-empty-function
     const response = await server.rcon.send(command).catch(() => {});
     if (!response)
       return {
         resp: false,
-        server: server.server,
+		identifier: serverIdentifier,
       };
     return {
       resp: response,

src/index.ts

@@ -4,6 +4,7 @@ import { readdir } from "fs/promises";
 import mongoose from "mongoose";
 import { Intents } from "discord.js";
 import Comfy from "./base/Comfy";
+import rcon from "./helpers/rcon";
 
 const client = new Comfy({
   intents: [
@@ -14,6 +15,7 @@ const client = new Comfy({
     Intents.FLAGS.GUILD_MESSAGE_REACTIONS,
     Intents.FLAGS.GUILD_PRESENCES,
     Intents.FLAGS.GUILD_WEBHOOKS,
+	Intents.FLAGS.GUILD_MEMBERS,
   ],
 });
 
@@ -66,7 +68,6 @@ const init = async () => {
 
   client.login(client.config.token);
 
-  let rcon = require("./helpers/rcon");
   rcon.client = client;
   const serverHandler = require("./helpers/serverHandler");
   const servers = new serverHandler(client);