diff --git a/package.json b/package.json index 2ba62979..192d1b12 100644 --- a/package.json +++ b/package.json @@ -10,16 +10,17 @@ }, "author": "Discord: @jonny_bro", "dependencies": { - "@discord-player/extractor": "^4.4.5", + "@discord-player/extractor": "^4.4.6", "@discordjs/opus": "^0.9.0", "@discordjs/rest": "^2.2.0", "@discordjs/voice": "^0.16.1", + "@distube/ytdl-core": "^4.13.3", "canvas": "^2.11.2", "chalk": "^4.1.2", "cron": "^2.4.4", "discord-api-types": "^0.37.67", "discord-giveaways": "^6.0.1", - "discord-player": "^6.6.6", + "discord-player": "^6.6.7", "discord.js": "^14.14.1", "gamedig": "^4.1.0", "i18next": "^21.10.0", @@ -28,8 +29,7 @@ "moment": "^2.29.4", "mongoose": "^7.6.3", "ms": "^2.1.3", - "node-fetch": "^2.7.0", - "youtube-ext": "^1.1.16" + "node-fetch": "^2.7.0" }, "devDependencies": { "eslint": "^8.52.0" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c805cc67..2ba8947e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -6,8 +6,8 @@ settings: dependencies: '@discord-player/extractor': - specifier: ^4.4.5 - version: 4.4.5 + specifier: ^4.4.6 + version: 4.4.6 '@discordjs/opus': specifier: ^0.9.0 version: 0.9.0 @@ -17,6 +17,9 @@ dependencies: '@discordjs/voice': specifier: ^0.16.1 version: 0.16.1(@discordjs/opus@0.9.0) + '@distube/ytdl-core': + specifier: ^4.13.3 + version: 4.13.3 canvas: specifier: ^2.11.2 version: 2.11.2 @@ -33,8 +36,8 @@ dependencies: specifier: ^6.0.1 version: 6.0.1(discord.js@14.14.1) discord-player: - specifier: ^6.6.6 - version: 6.6.6(@discord-player/extractor@4.4.5)(@discordjs/opus@0.9.0) + specifier: ^6.6.7 + version: 6.6.7(@discord-player/extractor@4.4.6)(@discordjs/opus@0.9.0) discord.js: specifier: ^14.14.1 version: 14.14.1 @@ -62,9 +65,6 @@ dependencies: node-fetch: specifier: ^2.7.0 version: 2.7.0 - youtube-ext: - specifier: ^1.1.16 - version: 1.1.16 devDependencies: eslint: @@ -89,8 +89,8 @@ packages: resolution: {integrity: sha512-71UAepYMbHTg2QQLXQAgyuXYHrgAYpJDxjg9dRWfTUNf+zfOAlyJEiRRk/WFhQyGu6m23iLR/H/JxgF4AW8Csg==} dev: false - /@discord-player/extractor@4.4.5: - resolution: {integrity: sha512-xy4PXrjYRF2VwLkxYFEB++Q6jutvAeLv58fHTW2HI2wbyiNYI8F6+dka1X0qd7ubKl8meE+bsfkmvJssAhsmyA==} + /@discord-player/extractor@4.4.6: + resolution: {integrity: sha512-jo511D+YOnBptfC+mp775kVXKuCfoWulqOhk82PBmRmwNLPfzBEyPQM+vOlzrNsmoRD1p3mBBXEOnFnuyE9o3w==} dependencies: file-type: 16.5.4 genius-lyrics: 4.4.6 @@ -234,6 +234,21 @@ packages: - utf-8-validate dev: false + /@distube/ytdl-core@4.13.3: + resolution: {integrity: sha512-WHVzp0NyUkmdxRkfU8tN7eRquL7bnia2U/EDNWVupCptRo7EToTdBKHwJrDFqvavbXsdqLG/kR1r+1LaPglrFQ==} + engines: {node: '>=12'} + dependencies: + http-cookie-agent: 5.0.4(tough-cookie@4.1.3)(undici@5.27.2) + m3u8stream: 0.8.6 + miniget: 4.2.3 + sax: 1.2.4 + tough-cookie: 4.1.3 + undici: 5.27.2 + transitivePeerDependencies: + - deasync + - supports-color + dev: false + /@eslint-community/eslint-utils@4.4.0(eslint@8.52.0): resolution: {integrity: sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} @@ -408,12 +423,6 @@ packages: '@types/node': 20.8.9 dev: false - /@types/ws@8.5.8: - resolution: {integrity: sha512-flUksGIQCnJd6sZ1l5dqCEG/ksaoAg/eUwiLAGTJQcfgvZJKF++Ta4bJA6A5aPSJmsr+xlseHn4KLgVlNnvPTg==} - dependencies: - '@types/node': 20.8.9 - dev: false - /@types/ws@8.5.9: resolution: {integrity: sha512-jbdrY0a8lxfdTp/+r7Z4CkycbOFN8WX+IOchLJr3juT/xzbJ8URyTVSJ/hvNdadTgM1mnedb47n+Y31GsFnQlg==} dependencies: @@ -456,6 +465,15 @@ packages: - supports-color dev: false + /agent-base@7.1.0: + resolution: {integrity: sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==} + engines: {node: '>= 14'} + dependencies: + debug: 4.3.4 + transitivePeerDependencies: + - supports-color + dev: false + /ajv@6.12.6: resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==} dependencies: @@ -732,13 +750,13 @@ packages: serialize-javascript: 6.0.1 dev: false - /discord-player@6.6.6(@discord-player/extractor@4.4.5)(@discordjs/opus@0.9.0): - resolution: {integrity: sha512-XYQU4Vuy3H1aXgdaNPajzp8od7salL5cy2JIWoUdINKv5rCVXeu24BxkPj7QB5Db6uK3yKCOumfIWkL0Il1uVQ==} + /discord-player@6.6.7(@discord-player/extractor@4.4.6)(@discordjs/opus@0.9.0): + resolution: {integrity: sha512-8y5TBJTF3vut4WJZFfrc8m7yXIkOr0WNbdKiU5I3MADWZQUlRaMBTGS4NO03Vq13nZZfK0c4XVUZuqtydIKp4w==} peerDependencies: - '@discord-player/extractor': ^4.4.5 + '@discord-player/extractor': ^4.4.6 dependencies: '@discord-player/equalizer': 0.2.3 - '@discord-player/extractor': 4.4.5 + '@discord-player/extractor': 4.4.6 '@discord-player/ffmpeg': 0.1.0 '@discord-player/utils': 0.2.2 discord-voip: 0.1.3(@discordjs/opus@0.9.0) @@ -759,7 +777,7 @@ packages: dependencies: '@discord-player/ffmpeg': 0.1.0 '@discord-player/opus': 0.1.2 - '@types/ws': 8.5.8 + '@types/ws': 8.5.10 discord-api-types: 0.37.67 prism-media: 1.3.5(@discordjs/opus@0.9.0) tslib: 2.6.2 @@ -1072,7 +1090,7 @@ packages: resolution: {integrity: sha512-TeSF4qXwLm+Nl8wUX+WUTJlEhPBanMw9EWpIHE2a/Qs4y2NBK99AHYfZJc73H1HVkZj4zPfscuGWlkQbbh0pDA==} dependencies: node-html-parser: 6.1.11 - undici: 5.27.0 + undici: 5.27.2 dev: false /get-stream@6.0.1: @@ -1155,6 +1173,26 @@ packages: resolution: {integrity: sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==} dev: false + /http-cookie-agent@5.0.4(tough-cookie@4.1.3)(undici@5.27.2): + resolution: {integrity: sha512-OtvikW69RvfyP6Lsequ0fN5R49S+8QcS9zwd58k6VSr6r57T8G29BkPdyrBcSwLq6ExLs9V+rBlfxu7gDstJag==} + engines: {node: '>=14.18.0 <15.0.0 || >=16.0.0'} + peerDependencies: + deasync: ^0.1.26 + tough-cookie: ^4.0.0 + undici: ^5.11.0 + peerDependenciesMeta: + deasync: + optional: true + undici: + optional: true + dependencies: + agent-base: 7.1.0 + tough-cookie: 4.1.3 + undici: 5.27.2 + transitivePeerDependencies: + - supports-color + dev: false + /http2-wrapper@2.2.0: resolution: {integrity: sha512-kZB0wxMo0sh1PehyjJUWRFEd99KC5TLjZ2cULC4f9iqJBAmKQQXEICjxl5iPJRwP40dpeHFqqhm7tYCvODpqpQ==} engines: {node: '>=10.19.0'} @@ -1360,6 +1398,14 @@ packages: engines: {node: '>=12'} dev: false + /m3u8stream@0.8.6: + resolution: {integrity: sha512-LZj8kIVf9KCphiHmH7sbFQTVe4tOemb202fWwvJwR9W5ENW/1hxJN6ksAWGhQgSBSa3jyWhnjKU1Fw1GaOdbyA==} + engines: {node: '>=12'} + dependencies: + miniget: 4.2.3 + sax: 1.2.4 + dev: false + /magic-bytes.js@1.5.0: resolution: {integrity: sha512-wJkXvutRbNWcc37tt5j1HyOK1nosspdh3dj6LUYYAvF6JYNqs53IfRvK9oEpcwiDA1NdoIi64yAMfdivPeVAyw==} dev: false @@ -1400,6 +1446,11 @@ packages: engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} dev: false + /miniget@4.2.3: + resolution: {integrity: sha512-SjbDPDICJ1zT+ZvQwK0hUcRY4wxlhhNpHL9nJOB2MEAXRGagTljsO8MEDzQMTFf0Q8g4QNi8P9lEm/g7e+qgzA==} + engines: {node: '>=12'} + dev: false + /minimatch@3.1.2: resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==} dependencies: @@ -1697,10 +1748,18 @@ packages: resolution: {integrity: sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==} dev: false + /psl@1.9.0: + resolution: {integrity: sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==} + dev: false + /punycode@2.3.0: resolution: {integrity: sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==} engines: {node: '>=6'} + /querystringify@2.2.0: + resolution: {integrity: sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==} + dev: false + /queue-microtask@1.2.3: resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==} dev: true @@ -1757,6 +1816,10 @@ packages: resolution: {integrity: sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA==} dev: false + /requires-port@1.0.0: + resolution: {integrity: sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==} + dev: false + /resolve-alpn@1.2.1: resolution: {integrity: sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==} dev: false @@ -1892,7 +1955,7 @@ packages: /soundcloud.ts@0.5.2: resolution: {integrity: sha512-/pc72HWYJpSpup+mJBE9pT31JsrMcxJGBlip3Vem+0Fsscg98xh1/7I2nCpAKuMAeV6MVyrisI8TfjO6T7qKJg==} dependencies: - undici: 5.27.0 + undici: 5.27.2 dev: false /sparse-bitfield@3.0.3: @@ -1997,6 +2060,16 @@ packages: ieee754: 1.2.1 dev: false + /tough-cookie@4.1.3: + resolution: {integrity: sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==} + engines: {node: '>=6'} + dependencies: + psl: 1.9.0 + punycode: 2.3.0 + universalify: 0.2.0 + url-parse: 1.5.10 + dev: false + /tr46@0.0.3: resolution: {integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==} dev: false @@ -2032,13 +2105,6 @@ packages: resolution: {integrity: sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==} dev: false - /undici@5.27.0: - resolution: {integrity: sha512-l3ydWhlhOJzMVOYkymLykcRRXqbUaQriERtR70B9LzNkZ4bX52Fc8wbTDneMiwo8T+AemZXvXaTx+9o5ROxrXg==} - engines: {node: '>=14.0'} - dependencies: - '@fastify/busboy': 2.0.0 - dev: false - /undici@5.27.2: resolution: {integrity: sha512-iS857PdOEy/y3wlM3yRp+6SNQQ6xU0mmZcwRSriqk+et/cwWAtwmIGf6WkoDN2EK/AMdCO/dfXzIwi+rFMrjjQ==} engines: {node: '>=14.0'} @@ -2050,12 +2116,24 @@ packages: resolution: {integrity: sha512-3xM2c89siXg0nHvlmYsQ2zkLASvVMBisZm5lF3gFDqfF2xonNStDJyMpvaOBe0a1Edxmqrf2E0HBdmy9QyZaeg==} dev: false + /universalify@0.2.0: + resolution: {integrity: sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==} + engines: {node: '>= 4.0.0'} + dev: false + /uri-js@4.4.1: resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==} dependencies: punycode: 2.3.0 dev: true + /url-parse@1.5.10: + resolution: {integrity: sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==} + dependencies: + querystringify: 2.2.0 + requires-port: 1.0.0 + dev: false + /util-deprecate@1.0.2: resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==} dev: false @@ -2145,12 +2223,6 @@ packages: engines: {node: '>=10'} dev: true - /youtube-ext@1.1.16: - resolution: {integrity: sha512-vyzHSwxlCAwqWUxZKJ/5g139BgnbmZFTy9I0nxDwqlbAh74dB1LjayCoB5BgLaaIkSMruEQwlf5bF+EeR235qA==} - dependencies: - undici: 5.27.2 - dev: false - /youtube-sr@4.3.9: resolution: {integrity: sha512-wPGEgVevSn32BJu5jiSHdvoryUCTCIM9LYT+yMDDpUfaev2Dh46dB+4qU31NgJ9XOsNxGlEKmc9qxUO5L0CE/Q==} dev: false