Bluemedia/muse
1
0
Fork 0
mirror of https://github.com/BluemediaDev/muse.git synced 2025-05-10 20:11:37 +02:00
Code Issues Projects Releases Packages 1 Wiki Activity

Correctly skip song if unavailable

Browse source 
Also lets user know in text channel that song is unavailable after skipping.

Fixes #324
This commit is contained in:
Max Isom 2021-09-18 16:55:50 -04:00
parent 81bbdb971d
commit 9a2ef876d3
No known key found for this signature in database
GPG key ID: 25C9B1A7F6798880
6 changed files with 66 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/services/player.ts
View file

@ -1,4 +1,4 @@
import {VoiceConnection, VoiceChannel, StreamDispatcher} from 'discord.js';
import {VoiceConnection, VoiceChannel, StreamDispatcher, Snowflake, Client, TextChannel} from 'discord.js';
import {promises as fs, createWriteStream} from 'fs';
import {Readable, PassThrough} from 'stream';
import path from 'path';
@ -7,6 +7,7 @@ import ytdl from 'ytdl-core';
import {WriteStream} from 'fs-capacitor';
import ffmpeg from 'fluent-ffmpeg';
import shuffle from 'array-shuffle';
import errorMsg from '../utils/error-msg';
export interface QueuedPlaylist {
title: string;
@ -20,6 +21,7 @@ export interface QueuedSong {
length: number;
playlist: QueuedPlaylist | null;
isLive: boolean;
addedInChannelId: Snowflake;
}
export enum STATUS {
@ -40,8 +42,11 @@ export default class {
private positionInSeconds = 0;
constructor(cacheDir: string) {
private readonly discordClient: Client;
constructor(cacheDir: string, client: Client) {
this.cacheDir = cacheDir;
this.discordClient = client;
}
async connect(channel: VoiceChannel): Promise<void> {
@ -142,7 +147,18 @@ export default class {
this.lastSongURL = currentSong.url;
}
} catch (error: unknown) {
this.removeCurrent();
const currentSong = this.getCurrent();
await this.forward(1);
if ((error as {statusCode: number}).statusCode === 410 && currentSong) {
const channelId = currentSong.addedInChannelId;
if (channelId) {
await (this.discordClient.channels.cache.get(channelId) as TextChannel).send(errorMsg(`${currentSong.title} is unavailable`));
return;
}
}
throw error;
}
}