Simp-O-Matic

commit bf5dc3b95724632f09bc0f7df68d61589544a758
parent db328516b2fd5b886dc9f02fc7e59b0ce08846f5
Author: Demonstrandum <moi@knutsen.co>
Date:   Wed, 11 Nov 2020 03:42:13 +0000

Don't check if paused if dispatcher does not exist.

Diffstat:
M
lib/commands/vc.ts
 | 
19
++++++++++---------

1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/lib/commands/vc.ts b/lib/commands/vc.ts
@@ -62,7 +62,7 @@ export default async(home_scope: HomeScope) => {
 		}
 		break;
 	} case "play": {
-		if (GID.vc_dispatcher.paused) {
+		if (GID.vc_dispatcher && GID.vc_dispatcher.paused) {
 			GID.vc_dispatcher.resume();
 			message.answer("Resuming playback.");
 		} else {
@@ -85,18 +85,19 @@ export default async(home_scope: HomeScope) => {
 					return;
 				}
 				const next = CONFIG.vc_queue.shift();
-				if (next) {
-					const stream = GID.vc_prefetch[next];
-					GID.vc_current_stream = stream;
-					GID.vc_dispatcher = GID.vc.play(stream);
-					CLIENT.channels.fetch(CONFIG.vc_channel)
-						.then((ch: TextChannel) =>
-							ch.send(`Now playing: ${next}`));
-				}
+				const stream = GID.vc_prefetch[next];
+				GID.vc_current_stream = stream;
+				GID.vc_dispatcher = GID.vc.play(stream);
+				CLIENT.channels.fetch(CONFIG.vc_channel)
+					.then((ch: TextChannel) =>
+						ch.send(`Now playing: ${next}`));
 			}
 
 			GID.vc_dispatcher.on('finish', end_handler);
 			GID.vc_current_stream.on('end', () => {
+				CLIENT.channels.fetch(CONFIG.vc_channel)
+					.then((ch: TextChannel) =>
+						ch.send("Stream ended."));
 				GID.vc_dispatcher.end();
 			});
 		}