set github dependencies in commit

Author: eliyya

package-lock.json

@@ -30,6 +30,7 @@
     "author": "",
     "license": "ISC",
     "dependencies": {
+        "@discordjs/voice": "^0.16.1",
         "@sentry/node": "7.61.0",
         "@sentry/profiling-node": "1.1.2",
         "bindings": "1.5.0",
@@ -50,12 +51,11 @@
         "signale": "1.4.0",
         "statcord.js": "3.4.3",
         "stripe": "12.18.0",
-        "yasha": "github:eliyya/ts-yasha#node",
+        "yasha": "github:eliyya/ts-yasha#1637c64",
         "youtubei.js": "5.8.0"
     },
     "devDependencies": {
         "@types/cors": "2.8.13",
-        "@types/dd-trace": "^0.9.0",
         "@types/express": "4.17.17",
         "@types/figlet": "1.5.6",
         "@types/i18n": "0.13.6",
@@ -65,7 +65,7 @@
         "concurrently": "8.2.0",
         "eslint": "8.46.0",
         "nodemon": "3.0.1",
-        "transjson": "github:OnekiDevs/transjson#jspkg",
+        "transjson": "github:OnekiDevs/transjson#1187c4b",
         "ts-standard": "12.0.2",
         "type-locales": "github:OnekiDevs/type-locales",
         "typescript": "5.1.6"
@@ -109,7 +109,10 @@
             "@typescript-eslint/restrict-plus-operands": "off",
             "@typescript-eslint/restrict-template-expressions": "off",
             "@typescript-eslint/no-base-to-string": "off",
-            "curly": ["error", "multi"]
+            "curly": [
+                "error",
+                "multi"
+            ]
         }
     },
     "prettier": {

package.json

@@ -3,8 +3,8 @@ import {
     ChatInputCommandInteraction,
     EmbedBuilder,
     VoiceChannel,
-    GuildMember,
     Colors,
+    User,
 } from 'discord.js'
 import { MusicCarouselShelf, MusicResponsiveListItem } from 'youtubei.js/dist/src/parser/nodes.js'
 import performanceMeters from '#cache/performanceMeters.js'
@@ -87,7 +87,7 @@ export default class play extends Command {
         // Si el usuario está en el mismo canal de voz que el bot
         try {
             const song = interaction.options.getString('song', false)
-            const search = song ? await this.search(song, interaction.member) : await this.getRecomended(player)
+            const search = song ? await this.search(song, interaction.user) : await this.getRecomended(player, interaction.user)
             if (!search) return await interaction.editReply({
                 embeds: [
                     new EmbedBuilder()
@@ -167,23 +167,24 @@ export default class play extends Command {
         return true
     }
 
-    async getRecomended (player: Player) {
+    async getRecomended (player: Player, user: User) {
         const client = player.guild.client as Client
         try {
             const home = await player.youtubei.music.getHomeFeed()
             const songs = home.sections?.[0] as MusicCarouselShelf
-            return songs.contents?.[randomInt(songs.contents.length)] as MusicResponsiveListItem
+            const song = songs.contents?.[randomInt(songs.contents.length)] as MusicResponsiveListItem
+            return await this.search(song.name ?? 'music', user)
         } catch (error) {
             logger.error(error)
             client.errorHandler.captureException(error as Error)
             return undefined
         }
     }
 
-    async search (query: string, member: GuildMember) {
-        const client = member.client as Client
+    async search (query: string, user: User) {
+        const client = user.client as Client
         try {
-            return await client.music.search(query, member, 'Youtube')
+            return await client.music.search(query, user, 'Youtube')
         } catch (error) {
             logger.error(error)
             client.errorHandler.captureException(error as Error)

src/slash/commands/Música/play.ts

@@ -28,6 +28,7 @@ import EmbedBuilder from '#structures/EmbedBuilder.js'
 const spamIntervald = new SpamIntervalDB()
 type UserExtended = GuildMember & {}
 type YoutubeInjecter<T> = T & { youtubei?: Innertube }
+type RequesterInjecter<T> = T & { requester: User }
 
 export default class MusicManager extends EventEmitter {
     players = new Collection<string, Player>()
@@ -54,7 +55,10 @@ export default class MusicManager extends EventEmitter {
         this.players.set(vc.guild.id, player)
         player.on('ready', async () => await this.trackStart(player))
         player.on('finish', () => this.trackEnd(player, true))
+        // TODO: yasha update
+        // @ts-expect-error
         player.on('debug', (debug: any) => logger.log(debug))
+        // @ts-expect-error
         player.on(yasha.VoiceConnection.Status.Destroyed, async () => await player.destroy())
         player.on('error', err => {
             client.errorHandler.captureException(err)
@@ -106,7 +110,7 @@ export default class MusicManager extends EventEmitter {
         else return false
     }
 
-    async trackStart (player: Player) {
+    async trackStart (player: Player): Promise<void> {
         // TODO: Check if the song limit is the saçme as stablished for the admins
         // if(player.queue.current?.duration > player.guild.)
 
@@ -123,6 +127,7 @@ export default class MusicManager extends EventEmitter {
             { band: 16000, gain: -4 }, // Frecuencia muy alta
         ]
         player.setEqualizer(equalizerSettings)
+        // @ts-expect-error
         player.player.playing = true
         player.paused = false
         const song = player.queue.current
@@ -157,7 +162,7 @@ export default class MusicManager extends EventEmitter {
             .setColor(client.settings.color)
         if (song.platform === 'Youtube')
             embed
-                .setImage(song.thumbnails[0].url)
+                .setImage(song.thumbnails?.[0].url ?? null)
                 .setDescription(
                     `${translate(keys.PLAYING)} **[${song.title}](https://music.youtube.com/watch?v=${
                         song.id
@@ -184,7 +189,7 @@ export default class MusicManager extends EventEmitter {
             )
 
         try {
-            return (player.message = await (await player.getTextChannel())?.send({
+            (player.message = await (await player.getTextChannel())?.send({
                 embeds: [embed],
                 components: [row],
             }))
@@ -206,8 +211,7 @@ export default class MusicManager extends EventEmitter {
         }
 
         if (player.queueRepeat) {
-            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-            player.queue.add(player.queue.current)
+            player.queue.add(track)
             player.queue.current = player.queue.shift() ?? null
             player.play()
             return this
@@ -273,7 +277,7 @@ export default class MusicManager extends EventEmitter {
                 },
                 {
                     name: translate(keys.REQUESTER),
-                    value: `${player.queue.current?.requester.user}`,
+                    value: `${player.queue.current?.requester}`,
                     inline: true,
                 },
             )
@@ -304,7 +308,7 @@ export default class MusicManager extends EventEmitter {
     async ejecutarAccion (elemento: any, player: Player) {
         // Lógica de tu acción
         const track = await client.music.search(elemento.video_id, client.user, 'Youtube')
-        // TODO extends track
+        if (!track) return
         player.queue.add(track)
     }
 
@@ -324,7 +328,7 @@ export default class MusicManager extends EventEmitter {
         return array
     }
 
-    async search (query: any, requester: YoutubeInjecter<User>, source: 'Spotify' | 'Youtube' | 'Soundcloud') {
+    async search (query: any, requester: YoutubeInjecter<User>, source: 'Spotify' | 'Youtube' | 'Soundcloud'): Promise<RequesterInjecter<yasha.Track> | undefined> {
         // let track
         // if (requester.youtubei)
         //     if (requester.youtubei.session.logged_in) {
@@ -343,9 +347,13 @@ export default class MusicManager extends EventEmitter {
             )
             if (!track) {
                 logger.debug('No track found')
-                track = await yasha.Source.Youtube.search(query)
+                const search = await yasha.Source.Youtube.search(query)
+                if (!search.length) return undefined
+                const tracks = search.filter(t => t instanceof yasha.Track)
+                if (!tracks.length) return undefined
+                track = tracks[0]
             }
-            logger.log('track: ', track)
+            if (!(track instanceof yasha.Track)) return undefined
             if (track?.platform !== 'Youtube') return undefined
             // if (track instanceof TrackPlaylist) {
             //     track.forEach(t => {
@@ -359,14 +367,16 @@ export default class MusicManager extends EventEmitter {
                     const stream = getMax(track.streams, 'bitrate')
                     track.streams = [stream.object]
                 } */
+            // @ts-expect-error
             track.requester = requester
-            // track.icon = null
-
+            // @ts-expect-error
             return track
             // }
         } catch (error) {
+            if ((error as Error).message === 'Video is age restricted') return undefined
             client.errorHandler.captureException(error as Error)
         }
+        return undefined
     }
 
     getPlayingPlayers () {

src/structures/MusicManager.ts

@@ -21,7 +21,6 @@ export default class Player extends yasha.TrackPlayer {
     guild: Guild
     leaveTimeout?: NodeJS.Timeout
     bitrate?: number
-    // @ts-expect-error
     connection?: yasha.VoiceConnection
     subscription?: any
     stayInVc = false
@@ -88,6 +87,7 @@ export default class Player extends yasha.TrackPlayer {
     override async destroy () {
         try {
             if (this.connection) this.disconnect()
+            // @ts-expect-error
             if (this.player) super.destroy()
 
             return this.manager.players.delete(this.guild.id)
@@ -142,7 +142,7 @@ export default class Player extends yasha.TrackPlayer {
 
         this.playing = !pause
         this.paused = pause
-
+        // @ts-expect-error
         if (this.player) this.setPaused(pause)
 
         return this

src/structures/Player.ts

@@ -1,9 +1,8 @@
-import { GuildMember } from 'discord.js'
+import { User } from 'discord.js'
 import { formatDuration } from './MusicManager.js'
 import { type Track as yashaTrack } from 'yasha'
 
-// @ts-expect-error
-type Track = yashaTrack & { requester: GuildMember, streams: any[] | null }
+type Track = yashaTrack & { requester: User, streams: any[] | null }
 export default class Queue extends Array<Track> {
     current: Track | null
     previous: Track | null