commands: whisper now rejects errors (#410)

FoseFx · web-flow · commit 6059f30b95a4 · 2020-08-18T20:21:22.000-05:00
* fix: client.whisper() now rejects when an error occurs

* Adds errorCommands to whisper test
diff --git a/lib/client.js b/lib/client.js
@@ -583,7 +583,8 @@ client.prototype.handleMessage = function handleMessage(message) {
 							"_promiseSubscribers",
 							"_promiseSubscribersoff",
 							"_promiseEmoteonly",
-							"_promiseEmoteonlyoff"
+							"_promiseEmoteonlyoff",
+							"_promiseWhisper"
 						], [noticeArr, [msgid, channel]]);
 						break;
 
diff --git a/lib/commands.js b/lib/commands.js
@@ -544,6 +544,16 @@ module.exports = {
 
 		// Send the command to the server and race the Promise against a delay..
 		return this._sendCommand(this._getPromiseDelay(), "#tmijs", `/w ${username} ${message}`, (resolve, reject) => {
+			this.once("_promiseWhisper", (err) => {
+				if (err) { reject(err); }
+			});
+		}).catch((error) => {
+			// Either an "actual" error occured or the timeout triggered
+			// the latter means no errors have occured and we can resolve
+			// else just elevate the error
+			if (error !== "No response from Twitch.") {
+				throw error;
+			}
 			var from = _.channel(username),
 				userstate = _.merge({
 						"message-type": "whisper",
@@ -557,10 +567,7 @@ module.exports = {
 				[from, userstate, message, true],
 				[from, userstate, message, true]
 			]);
-
-			// At this time, there is no possible way to detect if a message has been sent has been eaten
-			// by the server, so we can only resolve the Promise.
-			resolve([username, message]);
+			return [username, message];
 		});
 	}
 }
diff --git a/test/commands.js b/test/commands.js
@@ -398,7 +398,10 @@ var tests = [{
 	inputParams: ['moddymcmodface', 'You got unmodded! D:'],
 	returnedParams: ['moddymcmodface', 'You got unmodded! D:'],
 	serverTest: '/w',
-	serverCommand: ':tmi.twitch.tv WHISPER moddymcmodface :You got unmodded! D:'
+	serverCommand: ':tmi.twitch.tv WHISPER moddymcmodface :You got unmodded! D:',
+	errorCommands: [
+		no_permission,
+	]
 }];
 
 describe('commands (justinfan)', function() {
