From d21255d1ff2eac1b441d7e687794334c64c007e1 Mon Sep 17 00:00:00 2001 From: Chris Ham Date: Tue, 25 Sep 2018 17:07:19 -0700 Subject: [PATCH] join control chatroom --- config.json | 6 ++- fgfm.js | 6 ++- package-lock.json | 99 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 108 insertions(+), 3 deletions(-) diff --git a/config.json b/config.json index ba8b1bd..7901807 100755 --- a/config.json +++ b/config.json @@ -10,6 +10,7 @@ "textCmdCooldown": 5, "twitch": { "channel": "#greenham", + "modChannel": "#greenham (the-lab)", "botLogin": { "username": "greenhambot", "oauth": "oauth:90aunml4vwyt7zgulm7s5m7xt4hnpc" @@ -22,7 +23,10 @@ "admins": ["greenham","greenhambot"], "blacklistedUsers": [], "ircServer" : "irc.chat.twitch.tv", - "debug": false + "debug": false, + "channelId": 78410627, + "controlRoomId": "637d55c7-f194-4c86-98e3-3bce54fd8b30", + "subRoomId": "6686e48b-7c5c-408d-ab58-034766b99cd4" }, "obs": { "websocket": { diff --git a/fgfm.js b/fgfm.js index ca457c5..93c2a09 100755 --- a/fgfm.js +++ b/fgfm.js @@ -32,12 +32,14 @@ obs.init() // Connect to twitch, set up basic event listeners const twitchInit = (config) => { return new Promise((resolve, reject) => { - console.log(`Connecting to Twitch / ${config.channel}...`); + let controlRoom = `#chatrooms:${config.channelId}:${config.controlRoomId}`; + + console.log(`Connecting to Twitch / ${config.channel} / ${controlRoom}`); let defaultTwitchConfig = { autoRejoin: true, retryCount: 10, - channels: [config.channel], + channels: [config.channel, controlRoom], debug: config.debug }; diff --git a/package-lock.json b/package-lock.json index 628a147..a43ce52 100644 --- a/package-lock.json +++ b/package-lock.json @@ -198,6 +198,11 @@ "safer-buffer": "2.1.2" } }, + "escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" + }, "extsprintf": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", @@ -284,6 +289,28 @@ "resolved": "https://registry.npmjs.org/irc-colors/-/irc-colors-1.4.3.tgz", "integrity": "sha512-VeAnFC9fkb4nB/s6UtTNf3BH2wOk/sSBSzIzCpFwrgoFxVl6J5sov7FXXA0kmbk/mVAZQXfXAsQFjWnGPf4cRg==" }, + "ircv3": { + "version": "0.8.12", + "resolved": "https://registry.npmjs.org/ircv3/-/ircv3-0.8.12.tgz", + "integrity": "sha512-q4WrRzbUPfN8FNunnv7zdQXAdguRr1uJg6F2P6fxBcrhu92u+QcfRXacDRTX03BGaxd+D1nQe9jkmP5T9c/4sw==", + "requires": { + "escape-string-regexp": "1.0.5", + "universal-websocket-client": "1.0.2", + "ws": "3.3.3" + }, + "dependencies": { + "ws": { + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz", + "integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==", + "requires": { + "async-limiter": "1.0.0", + "safe-buffer": "5.1.2", + "ultron": "1.1.1" + } + } + } + }, "is-buffer": { "version": "1.1.6", "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", @@ -586,6 +613,24 @@ } } }, + "request-promise-core": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.1.tgz", + "integrity": "sha1-Pu4AssWqgyOc+wTFcA2jb4HNCLY=", + "requires": { + "lodash": "4.17.11" + } + }, + "request-promise-native": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.5.tgz", + "integrity": "sha1-UoF3D2jgyXGeUWP9P6tIIhX0/aU=", + "requires": { + "request-promise-core": "1.1.1", + "stealthy-require": "1.1.1", + "tough-cookie": "2.4.3" + } + }, "safe-buffer": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", @@ -631,6 +676,11 @@ "tweetnacl": "0.14.5" } }, + "stealthy-require": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz", + "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=" + }, "tough-cookie": { "version": "2.4.3", "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz", @@ -640,6 +690,11 @@ "punycode": "1.4.1" } }, + "tslib": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz", + "integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==" + }, "tunnel-agent": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", @@ -654,6 +709,50 @@ "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=", "optional": true }, + "twitch": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/twitch/-/twitch-1.0.0.tgz", + "integrity": "sha512-LRg7SwtwKPEtdXcKgQHh55YdT+oI2nqHKCBs+4coxK2Mtc5btwrQjaSbulEXwZaypEW1yyWT6x6g+Bo6IX3FBw==", + "requires": { + "request": "2.88.0", + "request-promise-native": "1.0.5", + "tslib": "1.9.3" + } + }, + "twitch-chat-client": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/twitch-chat-client/-/twitch-chat-client-1.1.0.tgz", + "integrity": "sha512-5BfGHhDtxvlvLJ2samqYzb9EPRTpTvZ5J5eXfZOWmqdGix8TgDELgsptIcrVLI7llACI0kpN6wgyLG/4OlXUhQ==", + "requires": { + "ircv3": "0.8.12", + "tslib": "1.9.3" + } + }, + "ultron": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz", + "integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==" + }, + "universal-websocket-client": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/universal-websocket-client/-/universal-websocket-client-1.0.2.tgz", + "integrity": "sha512-Pi6BdJtEAISb77GTbOLBLIWdYGezXgnJejrVBYKXxzNTsLcjJS+mWIJ2BRZElSlOG/wc7+yfOe5y30bzTu3Qqg==", + "requires": { + "ws": "3.3.3" + }, + "dependencies": { + "ws": { + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz", + "integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==", + "requires": { + "async-limiter": "1.0.0", + "safe-buffer": "5.1.2", + "ultron": "1.1.1" + } + } + } + }, "uuid": { "version": "3.3.2", "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",