From ba093b1fe4e75ee48036b1f1eb2ce496105ece2b Mon Sep 17 00:00:00 2001 From: oof2win2 Date: Mon, 1 Nov 2021 21:12:47 +0100 Subject: [PATCH 1/2] :sparkles: Allow hidden servers --- src/commands/Factorio/onlineplayers.ts | 2 ++ src/servers.example.ts | 1 + src/types.ts | 1 + 3 files changed, 4 insertions(+) diff --git a/src/commands/Factorio/onlineplayers.ts b/src/commands/Factorio/onlineplayers.ts index 5190a9b..f8e4805 100644 --- a/src/commands/Factorio/onlineplayers.ts +++ b/src/commands/Factorio/onlineplayers.ts @@ -23,9 +23,11 @@ const OnlinePlayers: Command = { const serversWithScenario = rcon.rconConnections .filter((connection) => connection.hasScenario) + .filter((connection) => connection.server.hidden === false) .map((connection) => connection.server.discordname); const serversWithoutScenario = rcon.rconConnections .filter((connection) => !connection.hasScenario) + .filter((connection) => connection.server.hidden === false) .map((connection) => connection.server.discordname); const scenarioOutputProm = serversWithScenario.map((discordname) => diff --git a/src/servers.example.ts b/src/servers.example.ts index 7267622..75d7a68 100644 --- a/src/servers.example.ts +++ b/src/servers.example.ts @@ -19,6 +19,7 @@ const servers: FactorioServer[] = [ discord: false, // requires the full scenario, not just the mod }, dev: false, // whether or not the server is developmental + hidden: false, // whether the server is hidden from ?po etc }, ]; diff --git a/src/types.ts b/src/types.ts index b9a56aa..393741d 100644 --- a/src/types.ts +++ b/src/types.ts @@ -12,6 +12,7 @@ export interface FactorioServer { discord: boolean; }; dev: boolean; + hidden: boolean } export type BotConfigEmojis = Record; From 46948b3cebebfb9558aded3f4182411da3420bc0 Mon Sep 17 00:00:00 2001 From: oof2win2 Date: Mon, 1 Nov 2021 21:18:38 +0100 Subject: [PATCH 2/2] :bug: Disable pings sent to moderator channel --- src/helpers/serverHandler.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/helpers/serverHandler.ts b/src/helpers/serverHandler.ts index 9d44f3b..c266e13 100644 --- a/src/helpers/serverHandler.ts +++ b/src/helpers/serverHandler.ts @@ -529,6 +529,7 @@ class serverHandler { } async discordHandler(data) { if (data.server.dev) return; // ignore dev server + if (data.server.hidden) return; // return if server is hidden const message = data.line.replace( "${serverName}", `<#${data.server.discordid}>` @@ -546,7 +547,6 @@ class serverHandler { modchannel.isText() && modchannel.send({ embed: new MessageEmbed(embed), - content: `<@&${config.moderatorroleid}>`, }); } async startHandler(data: OutputData) {