Updated twurple

Author: deusprogrammer

electron/bot/bot.js

@@ -1,7 +1,8 @@
 const { StaticAuthProvider } = require('@twurple/auth');
 const { ChatClient } = require('@twurple/chat');
 const { PubSubClient } = require('@twurple/pubsub');
-
+const { ApiClient } = require('@twurple/api');
+const { EventSubWsListener } = require('@twurple/eventsub-ws');
 const EventQueue = require('./components/base/eventQueue');
 
 const readline = require('readline');
@@ -17,7 +18,7 @@ const versionNumber = "3.0b";
  * INDEXES
  */
 
-let client, pubSubClient;
+let client, pubSubClient, apiClient, eventListener;
 let listeners = [];
 let cooldowns = {};
 let units = {
@@ -82,7 +83,7 @@ const performCustomCommand = (command, {type, coolDown, target}, botContext) =>
 // Define configuration options for chat bot
 const startBot = async (botConfig) => {
     try {
-        let {accessToken, clientId, twitchChannel, devMode} = botConfig;
+        let {accessToken, clientId, twitchChannel, devMode, broadcasterId} = botConfig;
         let botContext = {};
 
         let plugins = [deathCounterPlugin, requestPlugin, cameraObscura, modTools];
@@ -213,16 +214,34 @@ const startBot = async (botConfig) => {
             }
         }
 
+        const onFollow = async (followEvent) => {
+            try {
+                // Run through redemption plugin hooks
+                for (let plugin of plugins) {
+                    if (plugin.followHook) {
+                        plugin.followHook(followEvent, botContext);
+                    }
+                }
+            } catch (error) {
+                console.error("FOLLOW FAILURE: " + error);
+            }
+        }
+
         const rl = readline.createInterface({
             input: process.stdin,
             output: process.stdout,
             terminal: true
         });
 
-        const authProvider = new StaticAuthProvider(clientId, accessToken, ["chat:read", "chat:edit", "channel:read:redemptions", "channel:read:subscriptions", "bits:read", "channel_subscriptions"], "user");
+        const authProvider = new StaticAuthProvider(clientId, accessToken, ["chat:read", "chat:edit", "channel:read:redemptions", "channel:read:subscriptions", "bits:read", "moderator:read:followers", "channel_subscriptions"], "user");
+        apiClient = new ApiClient({authProvider});
+
         client = new ChatClient({authProvider, channels: [twitchChannel]});
-        pubSubClient = new PubSubClient();
-        const userId = await pubSubClient.registerUserListener(authProvider);
+
+        pubSubClient = new PubSubClient({authProvider});
+        
+        apiClient.eventSub.deleteAllSubscriptions();
+        eventListener = new EventSubWsListener({ apiClient });
 
         rl.on('line', onConsoleCommand);
 
@@ -232,16 +251,21 @@ const startBot = async (botConfig) => {
         });
         client.onConnect(onConnectedHandler);
         client.onRaid((channel, username, {viewerCount}) => {onRaid(channel, username, viewerCount)});
-        let subListener = await pubSubClient.onSubscription(userId, onSubscription);
-        let cheerListener = await pubSubClient.onBits(userId, onBits);
-        let redemptionListener = await pubSubClient.onRedemption(userId, onRedemption);
+        
+        let subListener = await pubSubClient.onSubscription(broadcasterId, onSubscription);
+        let cheerListener = await pubSubClient.onBits(broadcasterId, onBits);
+        let redemptionListener = await pubSubClient.onRedemption(broadcasterId, onRedemption);
+
+        eventListener.onChannelFollow(broadcasterId, broadcasterId, onFollow);
 
         listeners = [subListener, cheerListener, redemptionListener];
 
         // Connect to twitch chat and pubsub
-        client.connect();
+        await client.connect();
+        await eventListener.start();
     } catch (error) {
         console.error(`* Failed to start bot: ${error}`);
+        throw error;
     }
 };
 

electron/bot/botPlugins/cameraObscura.js

@@ -182,6 +182,8 @@ exports.init = async (botContext) => {}
 exports.followHook = async ({userName}, botContext) => {
     const {enabled, messageTemplate} = botContext.botConfig.alertConfigs.followAlert;
 
+    console.log("FOLLOW EVENT: " + userName);
+
     let alertMessage = `${userName} just followed!`;
     if (messageTemplate) {
         alertMessage = messageTemplate.replace("${username}", userName);

electron/main.js

@@ -19,20 +19,13 @@ const MEDIA_DIRECTORY = path.join(HOME, "media");
 const CONFIG_FILE = path.join(HOME, "config.json");
 const MIGRATION_FILE = path.join(HOME, "migration.json");
 const USER_DATA_FILE = path.join(HOME, "config.json");
-const REACT_APP_LOCATION = `file://${path.join(__dirname, '../build/index.html')}`
 const DEFAULT_FILE_SERVER_PORT = "8080";
 const ENV = process.env.RUNTIME_ENV || "prod";
 
+console.log("ENV:         " + ENV);
 console.log("HOME:        " + HOME);
 console.log("CONFIG FILE: " + CONFIG_FILE);
 
-let isDev = false;
-try {
-    isDev = require('electron-is-dev');
-} catch (e) {
-    console.log("Running in production mode using react app at: " + REACT_APP_LOCATION);
-}
-
 if (!fs.existsSync(HOME)) {
     console.log("HOME NOT FOUND");
     fs.mkdirSync(HOME, {recursive: true});
@@ -64,6 +57,8 @@ if (!fs.existsSync(CONFIG_FILE)) {
         "profileImage": "",
         "accessToken": "",
         "refreshToken": "",
+        "clientId": "z9sxe9lmchklcfoqpcaoe1fo8a660e",
+        "clientSecret": "ebtdjo3gx50d5qyk331mn6rrzh5wlx",
    }));
 }
 
@@ -122,7 +117,7 @@ const createWindow = async () => {
         const url = require('url').format({
             protocol: 'file',
             slashes: true,
-            pathname: require('path').join(__dirname, 'build/index.html')
+            pathname: require('path').join(__dirname, '../build/index.html')
           })
           win.loadURL(url)
     } else {
@@ -145,11 +140,6 @@ const createWindow = async () => {
             console.error('Failed to register protocol');
         }
     });
-
-    // Open the DevTools.
-    if (isDev) {
-        win.webContents.openDevTools({ mode: 'detach' });
-    }
 };
 
 // This method will be called when Electron has finished
@@ -200,7 +190,7 @@ const twitchRefresh = async () => {
 const twitchLogin = async () => {
     try {
         let token = await twitchOauth.getAccessToken({
-            scope: 'chat:read chat:edit channel:read:redemptions channel:read:subscriptions bits:read channel:manage:redemptions'
+            scope: 'chat:read chat:edit channel:read:redemptions channel:read:subscriptions bits:read channel:manage:redemptions moderator:read:followers'
         });
         let {twitchChannel, profileImage, id} = await getTwitchUser(null, token.access_token);
         config.accessToken = token.access_token;