From 46989942d829ae9467101aba5c4b400d055ceace Mon Sep 17 00:00:00 2001
From: Logan Cusano <logan@simplestepsolutions.com>
Date: Sat, 17 Aug 2024 17:02:05 -0400
Subject: [PATCH] Updated linting config #21

- Now works
- Ran linting on the repo
---
 discordBot/addons/linkCop.mjs        |  5 +----
 discordBot/commands/rssRemove.mjs    |  1 -
 discordBot/discordBot.mjs            |  5 +----
 discordBot/events/guildMemberAdd.mjs |  7 +------
 discordBot/events/messageCreate.mjs  |  5 +----
 eslint.config.mjs                    | 13 +++++++++----
 server.js                            |  7 ++-----
 7 files changed, 15 insertions(+), 28 deletions(-)

diff --git a/discordBot/addons/linkCop.mjs b/discordBot/addons/linkCop.mjs
index acf771c..cdb385e 100644
--- a/discordBot/addons/linkCop.mjs
+++ b/discordBot/addons/linkCop.mjs
@@ -2,10 +2,7 @@ import { DebugBuilder } from "../../modules/debugger.mjs";
 const log = new DebugBuilder("server", "discordBot.addons.linkCop");
 import { gptHandler } from "../modules/gptHandler.mjs";
 import dotenv from "dotenv";
-import {
-  getGuildConfig,
-  setGuildConfig,
-} from "../../modules/mongo-wrappers/mongoConfigWrappers.mjs";
+import { getGuildConfig } from "../../modules/mongo-wrappers/mongoConfigWrappers.mjs";
 dotenv.config();
 
 const linkRegExp = /http[s]?:\/\/\S+/g;
diff --git a/discordBot/commands/rssRemove.mjs b/discordBot/commands/rssRemove.mjs
index 2a0d2eb..3a51c21 100644
--- a/discordBot/commands/rssRemove.mjs
+++ b/discordBot/commands/rssRemove.mjs
@@ -1,6 +1,5 @@
 import { SlashCommandBuilder } from "discord.js";
 import { DebugBuilder } from "../../modules/debugger.mjs";
-import { removeSource } from "../../rss-manager/sourceManager.mjs";
 import {
   getAllFeeds,
   deleteFeedByTitle,
diff --git a/discordBot/discordBot.mjs b/discordBot/discordBot.mjs
index f4f605f..32c1a5d 100644
--- a/discordBot/discordBot.mjs
+++ b/discordBot/discordBot.mjs
@@ -1,9 +1,6 @@
 import { DebugBuilder } from "../modules/debugger.mjs";
 import { Client, GatewayIntentBits, Collection } from "discord.js";
-import {
-  registerActiveCommands,
-  unregisterAllCommands,
-} from "./modules/registerCommands.mjs";
+import { registerActiveCommands } from "./modules/registerCommands.mjs";
 import { RSSController } from "../rss-manager/rssController.mjs";
 import { join, dirname } from "path";
 import { readdirSync } from "fs";
diff --git a/discordBot/events/guildMemberAdd.mjs b/discordBot/events/guildMemberAdd.mjs
index b94a2f7..7ba21b6 100644
--- a/discordBot/events/guildMemberAdd.mjs
+++ b/discordBot/events/guildMemberAdd.mjs
@@ -4,12 +4,7 @@ import dotenv from "dotenv";
 dotenv.config();
 import { Events } from "discord.js";
 import { gptHandler } from "../modules/gptHandler.mjs";
-import {
-  getGuildConfig,
-  setGuildConfig,
-  getConfig,
-  setConfig,
-} from "../../modules/mongo-wrappers/mongoConfigWrappers.mjs";
+import { getGuildConfig } from "../../modules/mongo-wrappers/mongoConfigWrappers.mjs";
 
 export const name = Events.GuildMemberAdd;
 
diff --git a/discordBot/events/messageCreate.mjs b/discordBot/events/messageCreate.mjs
index 83adca1..0632db9 100644
--- a/discordBot/events/messageCreate.mjs
+++ b/discordBot/events/messageCreate.mjs
@@ -6,10 +6,7 @@ import { Events } from "discord.js";
 import { gptInteraction } from "../addons/gptInteraction.mjs";
 import { linkCop } from "../addons/linkCop.mjs";
 import PresenceManager from "../modules/presenceManager.mjs";
-import {
-  getGuildConfig,
-  setGuildConfig,
-} from "../../modules/mongo-wrappers/mongoConfigWrappers.mjs";
+import { getGuildConfig } from "../../modules/mongo-wrappers/mongoConfigWrappers.mjs";
 
 export const name = Events.MessageCreate;
 
diff --git a/eslint.config.mjs b/eslint.config.mjs
index d76f76c..c320074 100644
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -14,15 +14,19 @@ const compat = new FlatCompat({
 });
 
 export default [
+  // Apply ESLint recommended settings first
   ...compat.extends().map((config) => ({
     ...config,
+    files: ["**/*.mjs", "**/*.js", "**/*.cjs"],
+  })),
+
+  // Custom rules and plugin configuration
+  {
     plugins: {
       "unused-imports": unusedImports,
     },
-    files: ["**/*.mjs", "**/*.js", "**/*.cjs"],
     rules: {
-      ...config.rules,
-      // ...other your custom rules
+      // Custom rules here
       "no-console": "warn",
       "no-unused-vars": "off", // or "@typescript-eslint/no-unused-vars": "off",
       "unused-imports/no-unused-imports": "error",
@@ -35,8 +39,9 @@ export default [
           argsIgnorePattern: "^_",
         },
       ],
+      "prettier/prettier": "warn", // Integrate prettier
     },
-  })),
+  },
   prettierConfig, // Turns off all ESLint rules that have the potential to interfere with Prettier rules.
   eslintPluginPrettierRecommended,
 ];
diff --git a/server.js b/server.js
index b8b22d8..76918fd 100644
--- a/server.js
+++ b/server.js
@@ -1,11 +1,8 @@
 import { DebugBuilder } from "./modules/debugger.mjs";
 const log = new DebugBuilder("server", "server");
-import { nodeIo, app, server } from "./modules/socketServer.mjs";
+import { nodeIo, server } from "./modules/socketServer.mjs";
 import { loadAddons } from "./modules/addonManager.mjs";
-import {
-  serverClient,
-  addEnabledEventListeners,
-} from "./discordBot/discordBot.mjs";
+import { serverClient } from "./discordBot/discordBot.mjs";
 
 import dotenv from "dotenv";
 dotenv.config();