removed usage of sb.Config from .mts files

Supinic · Sep 29, 2024 · e06e778 · e06e778
1 parent 200d1f2
commit e06e778
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 26 deletions.
diff --git a/@types/classes/command.d.ts b/@types/classes/command.d.ts
@@ -488,7 +488,7 @@ export declare class Command extends ClassTemplate {
     getDynamicDescription: () => Promise<string[] | null>;
 
     /**
-     * Creates the command's detail URL based on a Configuration variable
+     * Creates the command's detail URL based on a configuration value
      * @param options
      * @param options.useCodePath If true, returns a path for the command's code description
      */

diff --git a/@types/globals.d.ts b/@types/globals.d.ts
@@ -33,8 +33,6 @@ declare var sb: {
     Date: core.Date,
     Error: core.Error,
     Promise: core.Promise,
-
-    Config: core.Config,
     Got: core.Got,
     // TODO add others
 }
diff --git a/gots/github/index.mts b/gots/github/index.mts
@@ -1,20 +1,17 @@
-import { Config } from "supi-core";
-
 export const definition = {
 	name: "GitHub",
 	optionsType: "function",
 	options: (() => {
-		if (!Config.has("API_GITHUB_KEY", true)) {
+		if (!process.env.API_GITHUB_KEY) {
 			return {
 				prefixUrl: "https://api.github.com"
 			};
 		}
 
-		const token = Config.get("API_GITHUB_KEY", true);
 		return {
 			prefixUrl: "https://api.github.com",
 			headers: {
-				Authorization: `Bearer ${token}`
+				Authorization: `Bearer ${process.env.API_GITHUB_KEY}`
 			}
 		};
 	}),

diff --git a/gots/supibot/index.mts b/gots/supibot/index.mts
@@ -1,12 +1,10 @@
-import { Config } from "supi-core";
-
 export const definition = {
 	name: "Supibot",
 	optionsType: "function",
 	options: (() => {
-		const secure = Config.get("SUPIBOT_API_SECURE", false) ?? false;
+		const secure = process.env.SUPIBOT_API_SECURE ?? false;
 		const protocol = (secure) ? "https" : "http";
-		const port = Config.get("SUPIBOT_API_PORT", false) ?? 80;
+		const port = process.env.SUPIBOT_API_PORT ?? 80;
 
 		return {
 			prefixUrl: `${protocol}://localhost:${port}`

diff --git a/gots/twitch-gql/index.mts b/gots/twitch-gql/index.mts
@@ -1,17 +1,15 @@
-import { Config } from "supi-core";
+const list = [
+	"TWITCH_GQL_OAUTH",
+	"TWITCH_GQL_CLIENT_ID",
+	"TWITCH_GQL_CLIENT_VERSION",
+	"TWITCH_GQL_DEVICE_ID"
+];
 
 export const definition = {
 	name: "TwitchGQL",
 	optionsType: "function",
 	options: (() => {
-		const list = [
-			"TWITCH_GQL_OAUTH",
-			"TWITCH_GQL_CLIENT_ID",
-			"TWITCH_GQL_CLIENT_VERSION",
-			"TWITCH_GQL_DEVICE_ID"
-		];
-
-		if (list.some(i => !Config.has(i, true))) {
+		if (list.some(key => !process.env[key])) {
 			throw new Error("Twitch GQL sb.Got instance cannot initialize - missing configuration variable(s)");
 		}
 
@@ -22,12 +20,12 @@ export const definition = {
 			headers: {
 				Accept: "*/*",
 				"Accept-Language": "en-US",
-				Authorization: `OAuth ${Config.get("TWITCH_GQL_OAUTH")}`,
-				"Client-ID": Config.get("TWITCH_GQL_CLIENT_ID"),
-				"Client-Version": Config.get("TWITCH_GQL_CLIENT_VERSION"),
+				Authorization: `OAuth ${process.env.TWITCH_GQL_OAUTH}`,
+				"Client-ID": process.env.TWITCH_GQL_CLIENT_ID,
+				"Client-Version": process.env.TWITCH_GQL_CLIENT_VERSION,
 				"Content-Type": "text/plain;charset=UTF-8",
 				Referer: "https://www.twitch.tv",
-				"X-Device-ID": Config.get("TWITCH_GQL_DEVICE_ID")
+				"X-Device-ID": process.env.TWITCH_GQL_DEVICE_ID
 			}
 		};
 	}),

diff --git a/init/definitions/chat_data/tables/Channel.sql b/init/definitions/chat_data/tables/Channel.sql
@@ -10,7 +10,7 @@ CREATE TABLE IF NOT EXISTS `chat_data`.`Channel` (
   `Logging` SET('Lines','Meta') NULL DEFAULT 'Lines,Meta' COLLATE 'utf8mb4_general_ci',
   `Banphrase_API_Type` ENUM('Pajbot') DEFAULT NULL COMMENT 'If a channel should use an external banphrase API, this should be its type. Currently only supports "Pajbot".',
   `Banphrase_API_URL` VARCHAR(100) DEFAULT NULL COMMENT 'If a channel should use an external banphrase API, this should be its bare URL - no https:// or endpoints',
-  `Banphrase_API_Downtime` enum('Ignore','Notify','Nothing','Refuse','Whisper') DEFAULT NULL COMMENT 'Determines the behaviour the bot should take if the banphrase API times out.\r\nIgnore - acts as if nothing happened and posts the message as is.\r\nNotify - same as Ignore, but adds a warning emoji\r\nRefuse - bot will refuse to reply with a warning message set up in Config',
+  `Banphrase_API_Downtime` enum('Ignore','Notify','Nothing','Refuse','Whisper') DEFAULT NULL COMMENT 'Determines the behaviour the bot should take if the banphrase API times out.\r\nIgnore - acts as if nothing happened and posts the message as is.\r\nNotify - same as Ignore, but adds a warning emoji\r\nRefuse - bot will refuse to reply with a warning message set up in config',
   `Message_Limit` SMALLINT(5) UNSIGNED DEFAULT NULL COMMENT 'If not NULL, this determines the maximum length of a message in said channel. If NULL, will use Platform defaults.',
   `Mirror` INT(10) UNSIGNED DEFAULT NULL COMMENT 'If not NULL, will mirror all messages from this channel to channel specified in Mirror.',
   `Description` TEXT DEFAULT NULL,