Add a fail-safe timeout

Author: Mitchdev

lib/commands/implementations/gulag.js

@@ -4,6 +4,9 @@ const CommandOutput = require('../command-output');
 const { makeBan } = require('../../chat-utils/punishment-helpers');
 
 function gulag(defaultBanTime) {
+  const pollDuration = 30000;
+
+  let failSafeTimeout = null;
   let gulagActive = false;
 
   return (input, services, rawMessage) => {
@@ -43,6 +46,7 @@ function gulag(defaultBanTime) {
     listener.on('err', (message) => {
       const error = JSON.parse(message);
       if (error.description === 'activepoll' && !gulagActive) {
+        clearTimeout(failSafeTimeout);
         services.messageRelay.stopRelay('gulag');
         services.messageRelay.sendOutputMessage(
           'Poll in progress. Please wait for the current poll to finish.',
@@ -57,14 +61,19 @@ function gulag(defaultBanTime) {
           ' vs ',
         )}`,
       );
+
+      // Fail-safe
+      failSafeTimeout = setTimeout(() => {
+        gulagActive = false;
+        services.messageRelay.stopRelay('gulag');
+      }, pollDuration + 5000);
     });
 
     listener.on('pollstop', (message) => {
+      clearTimeout(failSafeTimeout);
       gulagActive = false;
       services.messageRelay.stopRelay('gulag');
 
-      if (message === null) return; // pollstop is null if the bot loses connection to chat.
-
       services.messageRelay.sendOutputMessage('GULAG has ended:');
 
       const poll = JSON.parse(message);
@@ -100,7 +109,7 @@ function gulag(defaultBanTime) {
       'poll',
       JSON.stringify({
         weighted: false,
-        time: 30000,
+        time: pollDuration,
         question: `ENTER THE GULAG. Chatters battling it out to not get a ${muteString} ban. Vote KEEP not KICK!?`,
         options: users,
       }),

lib/commands/implementations/voteban.js

@@ -7,6 +7,9 @@ const basePunishmentHelper = require('../base-punishment-helper');
 const formatDuration = require('../../chat-utils/format-duration');
 
 function voteBan(ipBan, defaultBanTime, weighted) {
+  const pollDuration = 30000;
+
+  let failSafeTimeout = null;
   let votebanActive = false;
 
   return function ban(input, services, rawMessage) {
@@ -39,6 +42,7 @@ function voteBan(ipBan, defaultBanTime, weighted) {
     listener.on('err', (message) => {
       const error = JSON.parse(message);
       if (error.description === 'activepoll' && !votebanActive) {
+        clearTimeout(failSafeTimeout);
         services.messageRelay.stopRelay('voteban');
         services.messageRelay.sendOutputMessage(
           'Poll in progress. Please wait for the current poll to finish.',
@@ -53,14 +57,19 @@ function voteBan(ipBan, defaultBanTime, weighted) {
           muteString === 'PERMANENTLY' ? muteString : `for ${muteString}`
         } ${parsedReason ? ` Reason: ${parsedReason}` : ''}?`,
       );
+
+      // Fail-safe
+      failSafeTimeout = setTimeout(() => {
+        votebanActive = false;
+        services.messageRelay.stopRelay('voteban');
+      }, pollDuration + 5000);
     });
 
     listener.on('pollstop', (message) => {
+      clearTimeout(failSafeTimeout);
       votebanActive = false;
       services.messageRelay.stopRelay('voteban');
 
-      if (message === null) return; // pollstop is null if the bot loses connection to chat.
-
       services.messageRelay.sendOutputMessage('Total votes:');
 
       const poll = JSON.parse(message);
@@ -93,7 +102,7 @@ function voteBan(ipBan, defaultBanTime, weighted) {
       'poll',
       JSON.stringify({
         weighted,
-        time: 30000,
+        time: pollDuration,
         question: `Should we ban ${userToPunish} ${
           muteString === 'PERMANENTLY' ? muteString : `for ${muteString}`
         } ${parsedReason ? ` Reason: ${parsedReason}` : ''}`,

lib/message-routing/chat-service-router.js

@@ -33,7 +33,6 @@ class ChatServiceRouter {
     this.bot.on('closed', () => {
       this.logger.info('Chat socket closed. Attempting to reconnect....');
       if (this.chatToConnectTo === 'dgg') {
-        this.messageRelay.relayMessageToListeners('pollstop', null);
         setTimeout(() => {
           this.bot.connect();
         }, 5000);