kirameki-cafe-mirror/Yumi
1
0
Fork 0
mirror of https://github.com/kirameki-cafe/Yumi.git synced 2026-09-13 18:59:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Support unlisted and direct url for YouTube

Browse Source
This commit is contained in:
yuzu
2022-01-30 21:35:56 +07:00
parent 0759290306
commit 040eab96ef
1 changed files with 50 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/providers/DiscordMusicPlayer.ts
+42 -19
View File
@@ -60,9 +60,9 @@ export class DiscordMusicPlayerInstance {
this.player.on(AudioPlayerStatus.Idle, async (oldStage, newStage) => { this.player.on(AudioPlayerStatus.Idle, async (oldStage, newStage) => {
//The player stopped //The player stopped
if (newStage.status === AudioPlayerStatus.Idle && oldStage.status !== AudioPlayerStatus.Idle) { if (newStage.status === AudioPlayerStatus.Idle && oldStage.status !== AudioPlayerStatus.Idle) {
if(this.queue.track.length !== 0) { if (this.queue.track.length !== 0) {
this.queue.track.shift(); this.queue.track.shift();
if(this.queue.track.length > 0) { if (this.queue.track.length > 0) {
this.playTrack(this.queue.track[0]); this.playTrack(this.queue.track[0]);
} }
} }
@@ -82,8 +82,8 @@ export class DiscordMusicPlayerInstance {
public isConnected() { public isConnected() {
if (!this.voiceConnection) return false; if (!this.voiceConnection) return false;
if(this.voiceConnection.state.status === VoiceConnectionStatus.Destroyed) return false; if (this.voiceConnection.state.status === VoiceConnectionStatus.Destroyed) return false;
if(this.voiceConnection.state.status === VoiceConnectionStatus.Disconnected) return false; if (this.voiceConnection.state.status === VoiceConnectionStatus.Disconnected) return false;
return true; return true;
} }
@@ -96,7 +96,7 @@ export class DiscordMusicPlayerInstance {
if (!voiceChannel.joinable || !permissions.has("CONNECT")) if (!voiceChannel.joinable || !permissions.has("CONNECT"))
throw new Error("No permissions"); throw new Error("No permissions");
if(textChannel) if (textChannel)
this.textChannel = textChannel; this.textChannel = textChannel;
this.voiceConnection = joinVoiceChannel({ this.voiceConnection = joinVoiceChannel({
@@ -107,7 +107,7 @@ export class DiscordMusicPlayerInstance {
this.voiceConnection.on(VoiceConnectionStatus.Ready, (oldState: VoiceConnectionState, newState: VoiceConnectionState) => { this.voiceConnection.on(VoiceConnectionStatus.Ready, (oldState: VoiceConnectionState, newState: VoiceConnectionState) => {
let currentVC = DiscordProvider.client.guilds.cache.get(voiceChannel.guild.id)?.me?.voice.channel; let currentVC = DiscordProvider.client.guilds.cache.get(voiceChannel.guild.id)?.me?.voice.channel;
if(currentVC && currentVC.id !== this.voiceChannel.id) { if (currentVC && currentVC.id !== this.voiceChannel.id) {
this.voiceChannel = currentVC; this.voiceChannel = currentVC;
} }
}); });
@@ -115,10 +115,10 @@ export class DiscordMusicPlayerInstance {
public async leaveVoiceChannel() { public async leaveVoiceChannel() {
if(this.player) if (this.player)
this.player.pause(); this.player.pause();
if(DiscordProvider.client.guilds.cache.get(this.voiceChannel.guild.id)?.me?.voice) { if (DiscordProvider.client.guilds.cache.get(this.voiceChannel.guild.id)?.me?.voice) {
await DiscordProvider.client.guilds.cache.get(this.voiceChannel.guild.id)?.me?.voice.disconnect(); await DiscordProvider.client.guilds.cache.get(this.voiceChannel.guild.id)?.me?.voice.disconnect();
} }
@@ -126,7 +126,7 @@ export class DiscordMusicPlayerInstance {
public addTrackToQueue(track: (ValidTracks)) { public addTrackToQueue(track: (ValidTracks)) {
if(this.queue.track.length === 0) { if (this.queue.track.length === 0) {
this.queue.track.push(track); this.queue.track.push(track);
this.playTrack(this.queue.track[0]); this.playTrack(this.queue.track[0]);
return; return;
@@ -137,7 +137,7 @@ export class DiscordMusicPlayerInstance {
public async playTrack(track: ValidTracks) { public async playTrack(track: ValidTracks) {
if(!this.voiceConnection) throw new Error("No voice connection"); if (!this.voiceConnection) throw new Error("No voice connection");
const stream = await playdl.stream(track.url); const stream = await playdl.stream(track.url);
const resource = createAudioResource(stream.stream, { const resource = createAudioResource(stream.stream, {
@@ -149,9 +149,9 @@ export class DiscordMusicPlayerInstance {
} }
public async skipTrack() { public async skipTrack() {
if(!this.voiceConnection) throw new Error("No voice connection"); if (!this.voiceConnection) throw new Error("No voice connection");
if(this.queue.track.length > 1) { if (this.queue.track.length > 1) {
this.queue.track.shift(); this.queue.track.shift();
this.playTrack(this.queue.track[0]); this.playTrack(this.queue.track[0]);
} }
@@ -160,13 +160,13 @@ export class DiscordMusicPlayerInstance {
public async destroy() { public async destroy() {
await this.leaveVoiceChannel(); await this.leaveVoiceChannel();
if(this.voiceConnection) { if (this.voiceConnection) {
this.voiceConnection.removeAllListeners(); this.voiceConnection.removeAllListeners();
if(this.voiceConnection.state.status !== 'destroyed') if (this.voiceConnection.state.status !== 'destroyed')
this.voiceConnection.destroy(); this.voiceConnection.destroy();
} }
if(this.player) { if (this.player) {
this.player.removeAllListeners(); this.player.removeAllListeners();
this.player.stop(true); this.player.stop(true);
} }
@@ -183,7 +183,7 @@ class DiscordMusicPlayer {
public GuildQueue = new Map(); public GuildQueue = new Map();
public getGuildInstance(guildId: Snowflake): (DiscordMusicPlayerInstance | null) { public getGuildInstance(guildId: Snowflake): (DiscordMusicPlayerInstance | null) {
if(!this.isGuildInstanceExists(guildId)) return null; if (!this.isGuildInstanceExists(guildId)) return null;
return this.GuildQueue.get(guildId); return this.GuildQueue.get(guildId);
} }
@@ -199,7 +199,7 @@ class DiscordMusicPlayer {
let guildId: Snowflake = guild instanceof Guild ? guild.id : guild; let guildId: Snowflake = guild instanceof Guild ? guild.id : guild;
if(this.isGuildInstanceExists(guildId)) { if (this.isGuildInstanceExists(guildId)) {
await this.GuildQueue.get(guildId).destroy(); await this.GuildQueue.get(guildId).destroy();
this.GuildQueue.delete(guildId); this.GuildQueue.delete(guildId);
} }
@@ -229,7 +229,7 @@ class DiscordMusicPlayer {
// Last resort, search the title // Last resort, search the title
const videoInfo = await playdl.video_basic_info("https://www.youtube.com/watch?v=" + youtubeLink.videoId); const videoInfo = await playdl.video_basic_info("https://www.youtube.com/watch?v=" + youtubeLink.videoId);
if(videoInfo?.video_details?.title) { if (videoInfo?.video_details?.title) {
const searched: YouTubeVideo[] = await playdl.search(videoInfo.video_details.title, { source: { youtube: "video" } }); const searched: YouTubeVideo[] = await playdl.search(videoInfo.video_details.title, { source: { youtube: "video" } });
for (let video of searched) { for (let video of searched) {
if (video.id === youtubeLink.videoId) if (video.id === youtubeLink.videoId)
@@ -237,7 +237,30 @@ class DiscordMusicPlayer {
} }
} }
// TODO: Construct our own YouTubeVideo for unlisted videos or somehow the search failed let yt_info = await playdl.video_info("https://www.youtube.com/watch?v=" + youtubeLink.videoId);
if(yt_info) {
return new YouTubeVideo({
id: yt_info.video_details.id,
url: yt_info.video_details.url,
type: yt_info.video_details.type,
title: yt_info.video_details.title,
description: yt_info.video_details.description,
durationRaw: yt_info.video_details.durationRaw,
durationInSec: yt_info.video_details.durationInSec,
uploadedAt: yt_info.video_details.uploadedAt,
upcoming: yt_info.video_details.upcoming,
views: yt_info.video_details.views,
thumbnails: yt_info.video_details.thumbnails,
channel: yt_info.video_details.channel,
likes: yt_info.video_details.likes,
live: yt_info.video_details.live,
private: yt_info.video_details.private,
tags: yt_info.video_details.tags,
discretionAdvised: yt_info.video_details.discretionAdvised,
music: yt_info.video_details.music
});
}
return null; return null;
} }