merge beta into main (v3.1.0) (#23)

* Additional logging (#17) * begun ignoring channel framework * messageUpdate only fires when msg changes * fixed warning message not showing correctly * begun channel ignoration framework * fixed bugs * updated ignoredChannels framework * Additional logging (#18) * begun ignoring channel framework * messageUpdate only fires when msg changes * fixed warning message not showing correctly * begun channel ignoration framework * fixed bugs * updated ignoredChannels framework * updating files * added ignoredChannels framework * add ignoredChannel handler to msg event listeners * fixed file conflicts * Additional logging (#19) * begun ignoring channel framework * messageUpdate only fires when msg changes * fixed warning message not showing correctly * begun channel ignoration framework * fixed bugs * updated ignoredChannels framework * updating files * added ignoredChannels framework * add ignoredChannel handler to msg event listeners * fixed file conflicts * fixed infraction system issues * update list (#20) * updated list * remerge into beta branch (#22) * begun ignoring channel framework * messageUpdate only fires when msg changes * fixed warning message not showing correctly * begun channel ignoration framework * fixed bugs * updated ignoredChannels framework * updating files * added ignoredChannels framework * add ignoredChannel handler to msg event listeners * fixed file conflicts * fixed infraction system issues * updated list
aName2050 · Sep 30, 2023 · fa57b9f · fa57b9f
1 parent f91b85f
commit fa57b9f
Show file tree

Hide file tree

Showing 21 changed files with 312 additions and 161 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 node_modules
 .vscode
-config
+.env
+config/bot.json
diff --git a/Features-Tracker.txt b/Features-Tracker.txt
@@ -61,7 +61,7 @@ User Context Menu
 s simple command that can be finished quickly
 
 LOGGING:
-🔄️
+✅
 
 PREMIUM:
 - none for now -
diff --git a/config/colors.json b/config/colors.json
@@ -0,0 +1,11 @@
+{
+    "EMBED_INVIS_SIDEBAR": "#2B2D31",
+    "BACKGROUND": "#212529",
+    "PRIMARY": "#0D6EFD",
+    "SECONDARY": "#6C757D",
+    "SUCCESS": "#198754",
+    "INFO": "#0DCAF0",
+    "WARNING": "#FFC107",
+    "DANGER": "#DC3545",
+    "ERROR": "#B00020"
+}
diff --git a/config/web.json b/config/web.json
@@ -0,0 +1,7 @@
+{
+    "PORT": "5000",
+    "REDIRECTS": {
+        "local": "http://localhost:5000/login/discord/oauth/redirect",
+        "production": "https://compacter.gg/login/discord/oauth2/redirect"
+    }
+}
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -20,6 +20,7 @@
         "discord-arts": "^0.4.0",
         "discord-html-transcripts": "^3.1.4",
         "discord.js": "^14.9.0",
+        "dotenv": "^16.3.1",
         "express": "^4.18.2",
         "glob": "^10.2.1",
         "mongodb": "^5.5.0",
@@ -30,6 +31,6 @@
         "undici": "^5.20.0"
     },
     "devDependencies": {
-        "nodemon": "^2.0.21"
+        "nodemon": "^3.0.1"
     }
 }