Merge branch 'v1.3.x' of github.com:EllenFawkes/PurrplingBot into v1.3.x

Author: purrplingcat

README.md

@@ -8,13 +8,13 @@ A discordbot written primary for server PurrplingCat
 
 ### Regular download
 
-* Latest stable version 1.3.0: [Release v1.3.0 'Carmilla'](https://github.com/EllenFawkes/PurrplingBot/releases/tag/1.3.0)
+* Latest stable version 1.3.2: [Release v1.3.2 'Carmilla'](https://github.com/EllenFawkes/PurrplingBot/releases/tag/1.3.2)
 * Develop version: `git clone https://github.com/EllenFawkes/PurrplingBot.git`
 
 ### Get image from DockerHub
 
 ```bash
-docker pull purrplingcat/purrplingbot:1.3.0 # Latest stable version 1.3.0 'Carmilla'
+docker pull purrplingcat/purrplingbot:1.3.2 # Latest stable version 1.3.2 'Carmilla'
 docker pull purrplingcat/purrplingbot:latest # Latest development version
 ```
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "purrplingbot",
-  "version": "1.3.1-dev",
+  "version": "1.3.2",
   "codename": "Carmilla",
   "description": "A discordbot written primary for server PurrplingCat",
   "main": "purrplingbot.js",

plugins/Announcer/announcer.js

@@ -56,7 +56,7 @@ purrplingBot.on('message', function(message){
   if (message.author.id == bot.user.id) return;
   let antispam = announcerConf.antispam || true;
   if (antispam) {
-    repeater.processQueue();
+    repeater.processQueue(message.channel);
   }
 });
 
@@ -126,7 +126,7 @@ function cancelAnnounce(name) {
   }
 }
 
-function resumeAnnounce(name, interval) {
+function resumeAnnounce(name, interval, neverHandledFlag = false) {
   var announce = announces[name];
   if (!announce) {
     logger.info(`Announce '${name}' not exists - Can't resume!`);
@@ -151,7 +151,7 @@ function resumeAnnounce(name, interval) {
     var runner = bot.setInterval(handleAnnounce, duration, name, INTERVAL_TRIGGER);
     announceRunners[name] = runner;
     announce.active = true;
-    announce.neverHandled = true;
+    if (neverHandledFlag) announce.neverHandled = true;
     purrplingBot.logEvent(`Resumed announce '${announce.name}', Interval: ${announce.interval}, NeverHandled: ${announce.neverHandled}`, "Announce:Resume");
     logger.info(`Resumed announce: ${announce.name} (Interval: ${announce.interval})`);
     return announce;
@@ -272,7 +272,7 @@ function execSubCommand(scmd, args, message) {
       }
       var name = args[0];
       var interval = args[1];
-      var announce = resumeAnnounce(name, interval);
+      var announce = resumeAnnounce(name, interval, true);
       if (!announce) {
         message.reply(`Can't resume Announce '${name}' - Unknown error`)
         .catch(logger.error);

plugins/Announcer/repeater.js

@@ -37,7 +37,7 @@ class Repeater extends EventEmiter {
     return this;
   }
 
-  processQueue() {
+  processQueue(channel) {
     if (!this.options.enabled) {
       this._logger.log("Repeater is DISABLED!");
       return;
@@ -53,12 +53,17 @@ class Repeater extends EventEmiter {
       let announce = this.announces[announceName];
       let expires = durationParse(announce.interval) * this.options.expirePercentTime || 0.25;
       if ((currentTime.getTime() - announce.lastTry.getTime() < expires)) {
-        queue.push(announce);
+        if (announce.channel == channel.id) {
+          queue.push(announce);
+          this._queue.splice(this._queue.indexOf(announceName));
+        }
         this._logger.log("Added %s to process queue", announce.name);
-      } else this._logger.log("%s expired - Not added to queue", announce.name);
+      } else {
+         this._logger.log("%s expired - Not added to queue", announce.name);
+         this._queue.splice(this._queue.indexOf(announceName));
+       }
       this.emit('process', announce, queue);
     });
-    this._queue = [];
     setTimeout(_repeatAnnounce, durationParse(this.options.handleWait || "5m"), queue, this);
     this._logger.info("Repeater started! Announces in queue: ", queue.length);
     return queue;

plugins/Nextstream/nextstream.js

@@ -68,7 +68,7 @@ function streamLiveNowAnnounce() {
       } else {
         logger.error("An error occured while fetching stream status! %s", error);
         logger.dir(body);
-        PurrplingBot.logEvent("An error occured while fetching stream status! Status code: " + response.statusCode, "StreamCheck", "ERROR");
+        PurrplingBot.logEvent("An error occured while fetching stream status! " + error, "StreamCheck", "ERROR");
       }
   });
 }

plugins/Twitchcord/twitchcord.js

@@ -4,6 +4,7 @@ const CONFIG = PurrplingBot.getConfiguration();
 const TWITCHORD_CONFIG = CONFIG.twitchcord || {};
 
 var logger;
+var hostingChannel;
 
 var tmi = require("tmi.js");
 var tmiClient = new tmi.client({
@@ -60,9 +61,26 @@ tmiClient.on("hosting", function (source, target, viewers) {
     logger.error("[TWITCH -> DISCORD] Can't send info about hosting. Channel not found!");
     return;
   }
+  if (hostingChannel == target) {
+    logger.info("[TWITCH -> DISCORD] Info about hosting '%s' already sent!", target);
+    return;
+  }
+  hostingChannel = target;
   channel.send(`*Channel ${source} now hosting ${target} - <https://www.twitch.tv/${target}>*`)
-  .then(logger.info("[TWITCH -> DISCORD] Message forwarded to: #%s", channel.name))
+  .then(logger.info("[TWITCH -> DISCORD] Message about hosting '%s' forwarded to: #%s", target, channel.name))
+  .catch(logger.error);
+});
+
+tmiClient.on("unhost", function (channel, viewers) {
+  var channel = client.channels.find('id', TWITCHORD_CONFIG.discordChannelId || "");
+  if (!channel) {
+    logger.error("[TWITCH -> DISCORD] Can't send info about hosting. Channel not found!");
+    return;
+  }
+  channel.send(`*Channel ${source} ends hosting ${hostingChannel}*`)
+  .then(logger.info("[TWITCH -> DISCORD] Message about stop hosting '%s' forwarded to: #%s", hostingChannel, channel.name))
   .catch(logger.error);
+  hostingChannel = null;
 });
 
 PurrplingBot.on("message", function(message, isCmd) {