Merge pull request #16 from BarryCarlyon/deps

Deps
BarryCarlyon · Jan 8, 2025 · 3e6d73b · 3e6d73b
2 parents 6bef51d + 2cce26a
commit 3e6d73b
Show file tree

Hide file tree

Showing 8 changed files with 711 additions and 434 deletions.
diff --git a/modules/discord.js b/modules/discord.js
@@ -1,5 +1,3 @@
-const fetch = (...args) => import('node-fetch').then(({default: fetch}) => fetch(...args))
-
 module.exports = function(lib) {
     let { mysql_pool } = lib;
 

diff --git a/modules/eventsub.js b/modules/eventsub.js
@@ -1,4 +1,3 @@
-const fetch = (...args) => import('node-fetch').then(({default: fetch}) => fetch(...args))
 const crypto = require('crypto');
 
 module.exports = function(lib) {

diff --git a/modules/twitch.js b/modules/twitch.js
@@ -1,5 +1,3 @@
-const fetch = (...args) => import('node-fetch').then(({default: fetch}) => fetch(...args))
-
 module.exports = function(lib) {
     let { redis_client } = lib;
 
@@ -17,8 +15,8 @@ module.exports = function(lib) {
         )
         .then(loaded_token => {
             // no token create one
-            if (!loaded_token) {
-                throw new Error('No Token Generate');
+            if (!loaded_token || loaded_token == '') {
+                throw new Error('No Token on file');
                 return;
             }
 
@@ -85,6 +83,10 @@ module.exports = function(lib) {
         )
         .then(resp => resp.json().then(data => ({ status: resp.status, body: data })))
         .then(resp => {
+            if (resp.status != 200) {
+                // die
+                throw new Error('Failed to generate token', resp.body);
+            }
             resp.body.client_id = process.env.TWITCH_CLIENT_ID;
 
             return redis_client.HSET(