knotteye
/
satyr
Archived
1
0
Fork 0
Code Issues Pull Requests Releases 5 Wiki Activity

Merge branch 'develop' into 'master' 

Only join channels not already joined with twitchClient and ircClient

Closes #2

See merge request knotteye/satyr!11
merge-requests/12/merge
knotteye 2020-07-04 14:59:24 +00:00
parent 94bcecfd0a abd45c8346
commit 303924e77e
2 changed files with 35 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "satyr", "name": "satyr",
"version": "0.7.1", "version": "0.7.2",
"description": "A livestreaming server.", "description": "A livestreaming server.",
"license": "AGPL-3.0", "license": "AGPL-3.0",
"author": "knotteye", "author": "knotteye",

42
src/chat.ts
View File

@ -8,6 +8,7 @@ import * as twitch from "dank-twitch-irc";
var ircClient; var ircClient;
var xmppClient; var xmppClient;
var twitchClient; var twitchClient;
var twitchArr: Array<string> = [];
var discordClient; var discordClient;
var liveUsers: Array<any>; var liveUsers: Array<any>;
var chatIntegration: Array<any>; var chatIntegration: Array<any>;
@ -72,6 +73,15 @@ async function init() {
sendAll(lu[i], [msg['displayName'], msg['messageText']], "twitch"); sendAll(lu[i], [msg['displayName'], msg['messageText']], "twitch");
} }
}); });
//this library doesn't internally track which channels are currently joined, so we have to do it ourself
twitchClient.on('JOIN', (m) => {
if(twitchArr.indexOf(m['channelName']) === -1)
twitchArr.push(m['channelName']);
});
twitchClient.on('PART', (m) => {
if(twitchArr.indexOf(m['channelName']) !== -1)
twitchArr.splice(twitchArr.indexOf(m['channelName']), 1);
});
twitchClient.connect(); twitchClient.connect();
} }
} }
@ -165,22 +175,38 @@ function getUsr(channel: string, ctype: string): Array<string>{
} }
async function updateIRCChan() { async function updateIRCChan() {
var clist: Array<string> = []; var ilist: Array<string> = [];
for(var i=0;i<chatIntegration.length;i++){ for(var i=0;i<chatIntegration.length;i++){
if(chatIntegration[i]['irc'].trim() !== "" && chatIntegration[i]['irc'] !== null) clist.push(chatIntegration[i]['irc']); if(chatIntegration[i]['irc'].trim() !== "" && chatIntegration[i]['irc'] !== null) {
ilist.push(chatIntegration[i]['irc']);
}
} }
for(var i=0;i<clist.length;i++){ //do this to avoid duplicate channel joins
ircClient.join(clist[i]); //and leave IRC channels when done
var tmp: Array<string> = ilist.filter(n => !Object.keys(ircClient.chans).includes(n)); //channels to join
for(var i=0;i<tmp.length;i++){
ircClient.join(tmp[i]);
}
tmp = Object.keys(ircClient.chans).filter(n => !ilist.includes(n)); //channels to part
for(var i=0;i<tmp.length;i++){
ircClient.part(tmp[i]);
} }
} }
async function updateTwitchChan() { async function updateTwitchChan() {
var clist: Array<string> = []; var ilist: Array<string> = [];
for(var i=0;i<chatIntegration.length;i++){ for(var i=0;i<chatIntegration.length;i++){
if(chatIntegration[i]['twitch'].trim() !== "" && chatIntegration[i]['twitch'] !== null) clist.push(chatIntegration[i]['twitch']); if(chatIntegration[i]['twitch'].trim() !== "" && chatIntegration[i]['twitch'] !== null) ilist.push(chatIntegration[i]['twitch']);
} }
for(var i=0;i<clist.length;i++){ //do this to avoid duplicate channel joins
twitchClient.join(clist[i]); //and leave twitch channels when done
var tmp: Array<string> = ilist.filter(n => !twitchArr.includes(n)); //channels to join
for(var i=0;i<tmp.length;i++){
twitchClient.join(tmp[i]);
}
tmp = twitchArr.filter(n => !ilist.includes(n)); //channels to part
for(var i=0;i<tmp.length;i++){
twitchClient.part(tmp[i]);
} }
} }