ReUp of correct files, made a mistake

merged with an older version (I think), so here the correct files again
This commit is contained in:
Lea
2023-03-01 12:25:05 +01:00
committed by GitHub
parent 1612e5f6ba
commit 386fee2a84
7 changed files with 499 additions and 250 deletions
+28 -76
View File
@@ -11,8 +11,8 @@ if (twitch_channel_name !== "") {
logMessage("Twitch", `Client Connected`);
client.on('subscription', (channel, username, methods, message, userstate) => {
if (!countdownEnded) {
if(happy_hour == true && happy_hour_active == false){
if (!countdownEnded && subEnable) {
if(!happy_hour_active){
switch (methods['plan']) {
case "Prime":
addTime(endingTime, seconds_added_per_sub_prime);
@@ -32,7 +32,7 @@ if (twitch_channel_name !== "") {
break;
}
}
else if(happy_hour == true && happy_hour_active == true){
else if(happy_hour_active){
switch (methods['plan']) {
case "Prime":
addTime(endingTime, seconds_added_per_sub_prime_happy);
@@ -52,26 +52,6 @@ if (twitch_channel_name !== "") {
break;
}
}
else if(happy_hour == false){
switch (methods['plan']) {
case "Prime":
addTime(endingTime, seconds_added_per_sub_prime);
logMessage("Twitch", `Added ${seconds_added_per_sub_prime} Seconds Because ${username} Subscribed With Prime`);
break;
case "1000":
addTime(endingTime, seconds_added_per_sub_tier1);
logMessage("Twitch", `Added ${seconds_added_per_sub_tier1} Seconds Because ${username} Subscribed With Tier 1`);
break;
case "2000":
addTime(endingTime, seconds_added_per_sub_tier2);
logMessage("Twitch", `Added ${seconds_added_per_sub_tier2} Seconds Because ${username} Subscribed With Tier 2`);
break;
case "3000":
addTime(endingTime, seconds_added_per_sub_tier3);
logMessage("Twitch", `Added ${seconds_added_per_sub_tier3} Seconds Because ${username} Subscribed With Tier 3`);
break;
}
}
if (!users.includes(username)) {
users.push(username);
}
@@ -79,8 +59,8 @@ if (twitch_channel_name !== "") {
});
client.on('resub', (channel, username, months, message, userstate, methods) => {
if (!countdownEnded) {
if(happy_hour == true && happy_hour_active == false){
if (!countdownEnded && subEnable) {
if(!happy_hour_active){
switch (methods['plan']) {
case "Prime":
addTime(endingTime, seconds_added_per_resub_prime);
@@ -100,7 +80,7 @@ if (twitch_channel_name !== "") {
break;
}
}
else if(happy_hour == true && happy_hour_active == true){
else if(happy_hour_active){
switch (methods['plan']) {
case "Prime":
addTime(endingTime, seconds_added_per_resub_prime_happy);
@@ -120,26 +100,6 @@ if (twitch_channel_name !== "") {
break;
}
}
else if(happy_hour == false){
switch (methods['plan']) {
case "Prime":
addTime(endingTime, seconds_added_per_resub_prime);
logMessage("Twitch", `Added ${seconds_added_per_resub_prime} Seconds Because ${username} ReSubscribed With Prime`);
break;
case "1000":
addTime(endingTime, seconds_added_per_resub_tier1);
logMessage("Twitch", `Added ${seconds_added_per_resub_tier1} Seconds Because ${username} ReSubscribed With Tier 1`);
break;
case "2000":
addTime(endingTime, seconds_added_per_resub_tier2);
logMessage("Twitch", `Added ${seconds_added_per_resub_tier2} Seconds Because ${username} ReSubscribed With Tier 2`);
break;
case "3000":
addTime(endingTime, seconds_added_per_resub_tier3);
logMessage("Twitch", `Added ${seconds_added_per_resub_tier3} Seconds Because ${username} ReSubscribed With Tier 3`);
break;
}
}
if (!users.includes(username)) {
users.push(username);
}
@@ -147,8 +107,8 @@ if (twitch_channel_name !== "") {
});
client.on('subgift', (channel, username, months, recipient, methods, userstate) => {
if (!countdownEnded) {
if(happy_hour == true && happy_hour_active == false){
if (!countdownEnded && subEnable) {
if(!happy_hour_active){
switch (methods['plan']) {
case "Prime":
addTime(endingTime, seconds_added_per_giftsub_prime);
@@ -168,7 +128,7 @@ if (twitch_channel_name !== "") {
break;
}
}
else if(happy_hour == true && happy_hour_active == true){
else if(happy_hour_active){
switch (methods['plan']) {
case "Prime":
addTime(endingTime, seconds_added_per_giftsub_prime_happy);
@@ -188,26 +148,6 @@ if (twitch_channel_name !== "") {
break;
}
}
else if(happy_hour == false){
switch (methods['plan']) {
case "Prime":
addTime(endingTime, seconds_added_per_giftsub_tier1);
logMessage("Twitch", `Added ${seconds_added_per_giftsub_tier1} Seconds Because ${username} gifted Sub With Prime`);
break;
case "1000":
addTime(endingTime, seconds_added_per_giftsub_tier1);
logMessage("Twitch", `Added ${seconds_added_per_giftsub_tier1} Seconds Because ${username} gifted Sub With Tier 1`);
break;
case "2000":
addTime(endingTime, seconds_added_per_giftsub_tier2);
logMessage("Twitch", `Added ${seconds_added_per_giftsub_tier2} Seconds Because ${username} gifted Sub With Tier 2`);
break;
case "3000":
addTime(endingTime, seconds_added_per_giftsub_tier3);
logMessage("Twitch", `Added ${seconds_added_per_giftsub_tier3} Seconds Because ${username} gifted Sub With Tier 3`);
break;
}
}
if (!users.includes(username)) {
users.push(username);
}
@@ -215,13 +155,25 @@ if (twitch_channel_name !== "") {
});
client.on('cheer', (channel, userstate, message) => {
if (!countdownEnded) {
if (userstate.bits >= min_amount_of_bits) {
let times = Math.floor(userstate.bits/min_amount_of_bits);
addTime(endingTime, seconds_added_per_bits * times);
logMessage("Twitch", `Added ${seconds_added_per_bits * times} Seconds Because ${userstate['display-name']} Donated ${userstate.bits} Bits`);
if (!users.includes(userstate['display-name'])) {
users.push(userstate['display-name']);
if (!countdownEnded && bitEnable) {
if(!happy_hour_active){
if (userstate.bits >= min_amount_of_bits) {
let times = Math.floor(userstate.bits/min_amount_of_bits);
addTime(endingTime, seconds_added_per_bits * times);
logMessage("Twitch", `Added ${seconds_added_per_bits * times} Seconds Because ${userstate['display-name']} Donated ${userstate.bits} Bits`);
if (!users.includes(userstate['display-name'])) {
users.push(userstate['display-name']);
}
}
}
if(happy_hour_active){
if (userstate.bits >= min_amount_of_bits) {
let times = Math.floor(userstate.bits/min_amount_of_bits);
addTime(endingTime, seconds_added_per_bits_happy * times);
logMessage("Twitch", `Added ${seconds_added_per_bits_happy * times} Seconds Because ${userstate['display-name']} Donated ${userstate.bits} Bits`);
if (!users.includes(userstate['display-name'])) {
users.push(userstate['display-name']);
}
}
}
}