distube 4.0.5 → 4.1.0

package/dist/index.js

@@ -63,7 +63,7 @@ var require_package = __commonJS({
   "package.json"(exports, module2) {
     module2.exports = {
       name: "distube",
-      version: "4.0.5",
+      version: "4.1.0",
       description: "A Discord.js module to simplify your music commands and play songs with audio filters on Discord without any API key.",
       main: "./dist/index.js",
       types: "./dist/index.d.ts",
@@ -124,45 +124,47 @@ var require_package = __commonJS({
       ],
       homepage: "https://distube.js.org/",
       dependencies: {
-        "@distube/ytdl-core": "^4.11.12",
-        "@distube/ytpl": "^1.1.1",
-        "@distube/ytsr": "^1.1.9",
-        "prism-media": "https://codeload.github.com/distubejs/prism-media/tar.gz/main#workaround.tar.gz",
+        "@distube/ytdl-core": "^4.12.1",
+        "@distube/ytpl": "^1.1.4",
+        "@distube/ytsr": "^1.1.10",
+        "prism-media": "npm:@distube/prism-media@latest",
         "tiny-typed-emitter": "^2.1.0",
-        tslib: "^2.6.0",
-        undici: "^5.22.1"
+        "tough-cookie": "^4.1.3",
+        tslib: "^2.6.2",
+        undici: "^5.23.0"
       },
       devDependencies: {
-        "@babel/core": "^7.22.9",
+        "@babel/core": "^7.22.11",
         "@babel/plugin-proposal-class-properties": "^7.18.6",
         "@babel/plugin-proposal-object-rest-spread": "^7.20.7",
         "@babel/plugin-transform-private-methods": "^7.22.5",
-        "@babel/preset-env": "^7.22.9",
-        "@babel/preset-typescript": "^7.22.5",
-        "@commitlint/cli": "^17.6.7",
-        "@commitlint/config-conventional": "^17.6.7",
+        "@babel/preset-env": "^7.22.10",
+        "@babel/preset-typescript": "^7.22.11",
+        "@commitlint/cli": "^17.7.1",
+        "@commitlint/config-conventional": "^17.7.0",
         "@discordjs/voice": "^0.16.0",
         "@distubejs/docgen": "distubejs/docgen",
-        "@types/jest": "^29.5.3",
-        "@types/node": "^20.4.2",
-        "@typescript-eslint/eslint-plugin": "^6.1.0",
-        "@typescript-eslint/parser": "^6.1.0",
-        "babel-jest": "^29.6.1",
-        "discord.js": "^14.11.0",
-        eslint: "^8.45.0",
+        "@types/jest": "^29.5.4",
+        "@types/node": "^20.5.7",
+        "@types/tough-cookie": "^4.0.2",
+        "@typescript-eslint/eslint-plugin": "^6.5.0",
+        "@typescript-eslint/parser": "^6.5.0",
+        "babel-jest": "^29.6.4",
+        "discord.js": "^14.13.0",
+        eslint: "^8.48.0",
         "eslint-config-distube": "^1.6.4",
-        "eslint-config-prettier": "^8.8.0",
-        "eslint-plugin-deprecation": "^1.4.1",
-        "eslint-plugin-jsdoc": "^46.4.4",
+        "eslint-config-prettier": "^9.0.0",
+        "eslint-plugin-deprecation": "^1.5.0",
+        "eslint-plugin-jsdoc": "^46.5.1",
         husky: "^8.0.3",
-        jest: "^29.6.1",
+        jest: "^29.6.4",
         "jsdoc-babel": "^0.5.0",
         "nano-staged": "^0.8.0",
-        "npm-check-updates": "^16.10.16",
+        "npm-check-updates": "^16.13.2",
         pinst: "^3.0.0",
-        prettier: "^3.0.0",
-        tsup: "^7.1.0",
-        typescript: "^5.1.6"
+        prettier: "^3.0.3",
+        tsup: "^7.2.0",
+        typescript: "^5.2.2"
       },
       peerDependencies: {
         "@discordjs/opus": "*",
@@ -238,6 +240,7 @@ __export(src_exports, {
   isSnowflake: () => isSnowflake,
   isSupportedVoiceChannel: () => isSupportedVoiceChannel,
   isTextChannelInstance: () => isTextChannelInstance,
+  isTruthy: () => isTruthy,
   isURL: () => isURL,
   isVoiceChannelEmpty: () => isVoiceChannelEmpty,
   objectKeys: () => objectKeys,
@@ -441,7 +444,7 @@ var _TaskQueue = class _TaskQueue {
    * @type {boolean}
    */
   get hasResolveTask() {
-    return !!__privateGet(this, _tasks).find((t) => t.resolveInfo);
+    return __privateGet(this, _tasks).some((t) => t.resolveInfo);
   }
 };
 _tasks = new WeakMap();
@@ -481,9 +484,9 @@ var _Playlist = class _Playlist {
       this.songs = playlist;
       this.name = this.songs[0].name ? `${this.songs[0].name} and ${this.songs.length - 1} more songs.` : `${this.songs.length} songs playlist`;
       this.thumbnail = this.songs[0].thumbnail;
-      this.member = member || void 0;
+      this.member = member;
     } else {
-      this.source = (playlist.source || "youtube").toLowerCase();
+      this.source = playlist.source.toLowerCase();
       if (!Array.isArray(playlist.songs) || !playlist.songs.length)
         throw new DisTubeError("EMPTY_PLAYLIST");
       this.songs = playlist.songs;
@@ -491,9 +494,9 @@ var _Playlist = class _Playlist {
       playlist.title || (this.songs[0].name ? `${this.songs[0].name} and ${this.songs.length - 1} more songs.` : `${this.songs.length} songs playlist`);
       this.url = playlist.url || playlist.webpage_url;
       this.thumbnail = playlist.thumbnail || this.songs[0].thumbnail;
-      this.member = member || playlist.member || void 0;
+      this.member = member || playlist.member;
     }
-    this.songs.map((s) => s.constructor.name === "Song" && (s.playlist = this));
+    this.songs.forEach((s) => s.constructor.name === "Song" && (s.playlist = this));
     if (properties)
       for (const [key, value] of Object.entries(properties))
         this[key] = value;
@@ -504,7 +507,7 @@ var _Playlist = class _Playlist {
    * @type {number}
    */
   get duration() {
-    return this.songs?.reduce((prev, next) => prev + (next.duration || 0), 0) || 0;
+    return this.songs.reduce((prev, next) => prev + next.duration, 0);
   }
   /**
    * Formatted duration string `hh:mm:ss`.
@@ -524,7 +527,7 @@ var _Playlist = class _Playlist {
     if (!isMemberInstance(member))
       return;
     __privateSet(this, _member, member);
-    this.songs.map((s) => s.constructor.name === "Song" && (s.member = this.member));
+    this.songs.forEach((s) => s.constructor.name === "Song" && (s.member = this.member));
   }
   /**
    * User requested.
@@ -538,7 +541,7 @@ var _Playlist = class _Playlist {
   }
   set metadata(metadata) {
     __privateSet(this, _metadata, metadata);
-    this.songs.map((s) => s.constructor.name === "Song" && (s.metadata = metadata));
+    this.songs.forEach((s) => s.constructor.name === "Song" && (s.metadata = metadata));
   }
 };
 _metadata = new WeakMap();
@@ -676,7 +679,7 @@ var _Song = class _Song {
     const details = info.videoDetails || info;
     this.id = details.videoId || details.id;
     this.name = details.title || details.name;
-    this.isLive = !!details.isLive;
+    this.isLive = Boolean(details.isLive);
     this.duration = this.isLive ? 0 : toSecond(details.lengthSeconds || details.length_seconds || details.duration);
     this.formattedDuration = this.isLive ? "Live" : formatDuration(this.duration);
     this.url = `https://www.youtube.com/watch?v=${this.id}`;
@@ -693,7 +696,7 @@ var _Song = class _Song {
       name: info.uploader?.name || details.author?.name,
       url: info.uploader?.url || details.author?.channel_url || details.author?.url
     };
-    this.age_restricted = !!details.age_restricted;
+    this.age_restricted = Boolean(details.age_restricted);
     this.chapters = details.chapters || [];
     this.reposts = 0;
   }
@@ -729,7 +732,7 @@ var _Song = class _Song {
         url: info.uploader?.url
       };
     }
-    this.age_restricted = info.age_restricted || !!info.age_limit && parseNumber(info.age_limit) >= 18;
+    this.age_restricted = info.age_restricted || Boolean(info.age_limit) && parseNumber(info.age_limit) >= 18;
     this.chapters = info.chapters || [];
   }
   /**
@@ -878,27 +881,23 @@ var _DisTubeVoice = class _DisTubeVoice extends import_tiny_typed_emitter.TypedE
       this.emit("error", error);
     });
     this.connection.on(import_voice.VoiceConnectionStatus.Disconnected, (_, newState) => {
-      if (newState.reason === import_voice.VoiceConnectionDisconnectReason.Manual)
-        return this.leave();
-      if (newState.reason === import_voice.VoiceConnectionDisconnectReason.WebSocketClose && newState.closeCode === 4014) {
+      if (newState.reason === import_voice.VoiceConnectionDisconnectReason.Manual) {
+        this.leave();
+      } else if (newState.reason === import_voice.VoiceConnectionDisconnectReason.WebSocketClose && newState.closeCode === 4014) {
         (0, import_voice.entersState)(this.connection, import_voice.VoiceConnectionStatus.Connecting, 5e3).catch(() => {
           if (![import_voice.VoiceConnectionStatus.Ready, import_voice.VoiceConnectionStatus.Connecting].includes(this.connection.state.status)) {
             this.leave();
           }
         });
-        return;
-      }
-      if (this.connection.rejoinAttempts < 5) {
+      } else if (this.connection.rejoinAttempts < 5) {
         setTimeout(
           () => {
             this.connection.rejoin();
           },
           (this.connection.rejoinAttempts + 1) * 5e3
         ).unref();
-        return;
-      }
-      if (this.connection.state.status !== import_voice.VoiceConnectionStatus.Destroyed) {
-        return this.leave(new DisTubeError("VOICE_RECONNECT_FAILED"));
+      } else if (this.connection.state.status !== import_voice.VoiceConnectionStatus.Destroyed) {
+        this.leave(new DisTubeError("VOICE_RECONNECT_FAILED"));
       }
     }).on(import_voice.VoiceConnectionStatus.Destroyed, () => {
       this.leave();
@@ -1041,8 +1040,9 @@ var _DisTubeVoice = class _DisTubeVoice extends import_tiny_typed_emitter.TypedE
     if (state.status !== import_voice.AudioPlayerStatus.Paused)
       return;
     if (this.audioResource && state.resource !== this.audioResource)
-      return this.audioPlayer.play(this.audioResource);
-    this.audioPlayer.unpause();
+      this.audioPlayer.play(this.audioResource);
+    else
+      this.audioPlayer.unpause();
   }
   /**
    * Whether the bot is self-deafened
@@ -1155,17 +1155,14 @@ var _DisTubeStream = class _DisTubeStream {
       "2",
       "-f"
     ];
-    if (!options.type) {
+    if (!options.type)
       args.push("opus", "-acodec", "libopus");
-    } else {
+    else
       args.push("s16le");
-    }
-    if (typeof options.seek === "number" && options.seek > 0) {
+    if (typeof options.seek === "number" && options.seek > 0)
       args.unshift("-ss", options.seek.toString());
-    }
-    if (Array.isArray(options.ffmpegArgs)) {
+    if (Array.isArray(options.ffmpegArgs) && options.ffmpegArgs.length)
       args.push(...options.ffmpegArgs);
-    }
     this.stream = new import_prism_media.FFmpeg({ args, shell: false });
     this.stream._readableState && (this.stream._readableState.highWaterMark = 1 << 25);
   }
@@ -1210,9 +1207,12 @@ var DisTubeStream = _DisTubeStream;
 // src/core/DisTubeHandler.ts
 var import_ytpl = __toESM(require("@distube/ytpl"));
 var import_ytdl_core = __toESM(require("@distube/ytdl-core"));
+var import_tough_cookie = require("tough-cookie");
+var _cookie;
 var _DisTubeHandler = class _DisTubeHandler extends DisTubeBase {
   constructor(distube) {
     super(distube);
+    __privateAdd(this, _cookie, "");
     const client = this.client;
     if (this.options.leaveOnEmpty) {
       client.on("voiceStateUpdate", (oldState) => {
@@ -1248,18 +1248,28 @@ var _DisTubeHandler = class _DisTubeHandler extends DisTubeBase {
   }
   get ytdlOptions() {
     const options = this.options.ytdlOptions;
-    if (this.options.youtubeCookie) {
-      if (!options.requestOptions)
-        options.requestOptions = {};
-      if (!options.requestOptions.headers)
-        options.requestOptions.headers = {};
-      options.requestOptions.headers.cookie = this.options.youtubeCookie;
-      if (this.options.youtubeIdentityToken) {
-        options.requestOptions.headers["x-youtube-identity-token"] = this.options.youtubeIdentityToken;
+    if (this.options.youtubeCookie && this.options.youtubeCookie !== __privateGet(this, _cookie)) {
+      const cookies = __privateSet(this, _cookie, this.options.youtubeCookie);
+      if (typeof cookies === "string") {
+        console.warn(
+          "\x1B[33mWARNING:\x1B[0m You are using the old YouTube cookie format, please use the new one instead. (https://distube.js.org/#/docs/DisTube/main/general/cookie)"
+        );
+        options.agent = import_ytdl_core.default.createAgent(
+          cookies.split(";").map((c) => import_tough_cookie.Cookie.parse(c)).filter(isTruthy)
+        );
+      } else {
+        options.agent = import_ytdl_core.default.createAgent(cookies);
       }
     }
     return options;
   }
+  get ytCookie() {
+    const agent = this.ytdlOptions.agent;
+    if (!agent)
+      return "";
+    const { jar } = agent;
+    return jar.getCookieStringSync("https://www.youtube.com");
+  }
   /**
    * @param {string} url url
    * @param {boolean} [basic=false] getBasicInfo?
@@ -1323,7 +1333,7 @@ var _DisTubeHandler = class _DisTubeHandler extends DisTubeBase {
       return playlist;
     }
     if (typeof playlist === "string") {
-      const info = await (0, import_ytpl.default)(playlist, { limit: Infinity });
+      const info = await (0, import_ytpl.default)(playlist, { limit: Infinity, requestOptions: { headers: { cookie: this.ytCookie } } });
       const songs = info.items.filter((v) => !v.thumbnail.includes("no_thumbnail")).map((v) => new Song(v, { member, metadata }));
       return new Playlist(
         {
@@ -1381,7 +1391,7 @@ var _DisTubeHandler = class _DisTubeHandler extends DisTubeBase {
   async createSearchMessageCollector(message, results, query) {
     if (!isMessageInstance(message))
       throw new DisTubeError("INVALID_TYPE", "Discord.Message", message, "message");
-    if (!Array.isArray(results) || results.length == 0) {
+    if (!Array.isArray(results) || results.length === 0) {
       throw new DisTubeError("INVALID_TYPE", "Array<SearchResult|Song|Playlist>", results, "results");
     }
     if (this.options.searchSongs > 1) {
@@ -1408,8 +1418,7 @@ var _DisTubeHandler = class _DisTubeHandler extends DisTubeBase {
     if (limit > 1) {
       results.splice(limit);
       this.emit("searchResult", message, results, query);
-      const c = message.channel;
-      const answers = await c.awaitMessages({
+      const answers = await message.channel.awaitMessages({
         filter: (m) => m.author.id === message.author.id,
         max: 1,
         time: this.options.searchCooldown * 1e3,
@@ -1526,6 +1535,7 @@ var _DisTubeHandler = class _DisTubeHandler extends DisTubeBase {
     }
   }
 };
+_cookie = new WeakMap();
 __name(_DisTubeHandler, "DisTubeHandler");
 var DisTubeHandler = _DisTubeHandler;
 
@@ -1544,7 +1554,6 @@ var _Options = class _Options {
     __publicField(this, "searchSongs");
     __publicField(this, "searchCooldown");
     __publicField(this, "youtubeCookie");
-    __publicField(this, "youtubeIdentityToken");
     __publicField(this, "customFilters");
     __publicField(this, "ytdlOptions");
     __publicField(this, "nsfw");
@@ -1565,7 +1574,6 @@ var _Options = class _Options {
     this.savePreviousSongs = opts.savePreviousSongs;
     this.searchSongs = opts.searchSongs;
     this.youtubeCookie = opts.youtubeCookie;
-    this.youtubeIdentityToken = opts.youtubeIdentityToken;
     this.customFilters = opts.customFilters;
     this.ytdlOptions = opts.ytdlOptions;
     this.searchCooldown = opts.searchCooldown;
@@ -1582,82 +1590,48 @@ var _Options = class _Options {
 };
 _validateOptions = new WeakSet();
 validateOptions_fn = /* @__PURE__ */ __name(function(options = this) {
-  if (typeof options.emitNewSongOnly !== "boolean") {
-    throw new DisTubeError("INVALID_TYPE", "boolean", options.emitNewSongOnly, "DisTubeOptions.emitNewSongOnly");
-  }
-  if (typeof options.leaveOnEmpty !== "boolean") {
-    throw new DisTubeError("INVALID_TYPE", "boolean", options.leaveOnEmpty, "DisTubeOptions.leaveOnEmpty");
-  }
-  if (typeof options.leaveOnFinish !== "boolean") {
-    throw new DisTubeError("INVALID_TYPE", "boolean", options.leaveOnFinish, "DisTubeOptions.leaveOnFinish");
-  }
-  if (typeof options.leaveOnStop !== "boolean") {
-    throw new DisTubeError("INVALID_TYPE", "boolean", options.leaveOnStop, "DisTubeOptions.leaveOnStop");
-  }
-  if (typeof options.savePreviousSongs !== "boolean") {
-    throw new DisTubeError("INVALID_TYPE", "boolean", options.savePreviousSongs, "DisTubeOptions.savePreviousSongs");
-  }
-  if (typeof options.joinNewVoiceChannel !== "boolean") {
-    throw new DisTubeError(
-      "INVALID_TYPE",
-      "boolean",
-      options.joinNewVoiceChannel,
-      "DisTubeOptions.joinNewVoiceChannel"
-    );
-  }
-  if (typeof options.youtubeCookie !== "undefined" && typeof options.youtubeCookie !== "string") {
-    throw new DisTubeError("INVALID_TYPE", "string", options.youtubeCookie, "DisTubeOptions.youtubeCookie");
-  }
-  if (typeof options.youtubeIdentityToken !== "undefined" && typeof options.youtubeIdentityToken !== "string") {
-    throw new DisTubeError(
-      "INVALID_TYPE",
-      "string",
-      options.youtubeIdentityToken,
-      "DisTubeOptions.youtubeIdentityToken"
-    );
-  }
-  if (typeof options.customFilters !== "undefined" && typeof options.customFilters !== "object" || Array.isArray(options.customFilters)) {
-    throw new DisTubeError("INVALID_TYPE", "object", options.customFilters, "DisTubeOptions.customFilters");
-  }
-  if (typeof options.ytdlOptions !== "object" || Array.isArray(options.ytdlOptions)) {
-    throw new DisTubeError("INVALID_TYPE", "object", options.ytdlOptions, "DisTubeOptions.ytdlOptions");
-  }
-  if (typeof options.searchCooldown !== "number" || isNaN(options.searchCooldown)) {
-    throw new DisTubeError("INVALID_TYPE", "number", options.searchCooldown, "DisTubeOptions.searchCooldown");
-  }
-  if (typeof options.emptyCooldown !== "number" || isNaN(options.emptyCooldown)) {
-    throw new DisTubeError("INVALID_TYPE", "number", options.emptyCooldown, "DisTubeOptions.emptyCooldown");
-  }
-  if (typeof options.searchSongs !== "number" || isNaN(options.searchSongs)) {
-    throw new DisTubeError("INVALID_TYPE", "number", options.searchSongs, "DisTubeOptions.searchSongs");
-  }
-  if (!Array.isArray(options.plugins)) {
-    throw new DisTubeError("INVALID_TYPE", "Array<Plugin>", options.plugins, "DisTubeOptions.plugins");
-  }
-  if (typeof options.nsfw !== "boolean") {
-    throw new DisTubeError("INVALID_TYPE", "boolean", options.nsfw, "DisTubeOptions.nsfw");
-  }
-  if (typeof options.emitAddSongWhenCreatingQueue !== "boolean") {
-    throw new DisTubeError(
-      "INVALID_TYPE",
-      "boolean",
-      options.emitAddSongWhenCreatingQueue,
-      "DisTubeOptions.emitAddSongWhenCreatingQueue"
-    );
-  }
-  if (typeof options.emitAddListWhenCreatingQueue !== "boolean") {
-    throw new DisTubeError(
-      "INVALID_TYPE",
-      "boolean",
-      options.emitAddListWhenCreatingQueue,
-      "DisTubeOptions.emitAddListWhenCreatingQueue"
-    );
-  }
-  if (typeof options.streamType !== "number" || isNaN(options.streamType) || !StreamType[options.streamType]) {
-    throw new DisTubeError("INVALID_TYPE", "StreamType", options.streamType, "DisTubeOptions.streamType");
-  }
-  if (typeof options.directLink !== "boolean") {
-    throw new DisTubeError("INVALID_TYPE", "boolean", options.directLink, "DisTubeOptions.directLink");
+  const booleanOptions = /* @__PURE__ */ new Set([
+    "emitNewSongOnly",
+    "leaveOnEmpty",
+    "leaveOnFinish",
+    "leaveOnStop",
+    "savePreviousSongs",
+    "joinNewVoiceChannel",
+    "nsfw",
+    "emitAddSongWhenCreatingQueue",
+    "emitAddListWhenCreatingQueue",
+    "directLink"
+  ]);
+  const numberOptions = /* @__PURE__ */ new Set(["searchCooldown", "emptyCooldown", "searchSongs"]);
+  const stringOptions = /* @__PURE__ */ new Set();
+  const objectOptions = /* @__PURE__ */ new Set(["customFilters", "ytdlOptions"]);
+  const optionalOptions = /* @__PURE__ */ new Set(["youtubeCookie", "customFilters"]);
+  for (const [key, value] of Object.entries(options)) {
+    if (value === void 0 && optionalOptions.has(key))
+      continue;
+    if (key === "youtubeCookie" && !Array.isArray(value) && typeof value !== "string") {
+      throw new DisTubeError("INVALID_TYPE", ["Array<Cookie>", "string"], value, `DisTubeOptions.${key}`);
+    } else if (key === "streamType" && (typeof value !== "number" || isNaN(value) || !StreamType[value])) {
+      throw new DisTubeError("INVALID_TYPE", "StreamType", value, `DisTubeOptions.${key}`);
+    } else if (key === "plugins" && !Array.isArray(value)) {
+      throw new DisTubeError("INVALID_TYPE", "Array<Plugin>", value, `DisTubeOptions.${key}`);
+    } else if (booleanOptions.has(key)) {
+      if (typeof value !== "boolean") {
+        throw new DisTubeError("INVALID_TYPE", "boolean", value, `DisTubeOptions.${key}`);
+      }
+    } else if (numberOptions.has(key)) {
+      if (typeof value !== "number" || isNaN(value)) {
+        throw new DisTubeError("INVALID_TYPE", "number", value, `DisTubeOptions.${key}`);
+      }
+    } else if (stringOptions.has(key)) {
+      if (typeof value !== "string") {
+        throw new DisTubeError("INVALID_TYPE", "string", value, `DisTubeOptions.${key}`);
+      }
+    } else if (objectOptions.has(key)) {
+      if (typeof value !== "object" || Array.isArray(value)) {
+        throw new DisTubeError("INVALID_TYPE", "object", value, `DisTubeOptions.${key}`);
+      }
+    }
   }
 }, "#validateOptions");
 __name(_Options, "Options");
@@ -1768,17 +1742,15 @@ __name(_DisTubeVoiceManager, "DisTubeVoiceManager");
 var DisTubeVoiceManager = _DisTubeVoiceManager;
 
 // src/core/manager/FilterManager.ts
-var _validate, validate_fn, _resolveName, resolveName_fn, _resolveValue, resolveValue_fn, _apply, apply_fn, _removeFn, removeFn_get;
+var _resolve, resolve_fn, _apply, apply_fn, _removeFn, removeFn_fn;
 var _FilterManager = class _FilterManager extends BaseManager {
   constructor(queue) {
     super(queue.distube);
-    __privateAdd(this, _validate);
-    __privateAdd(this, _resolveName);
-    __privateAdd(this, _resolveValue);
+    __privateAdd(this, _resolve);
     __privateAdd(this, _apply);
     __privateAdd(this, _removeFn);
     /**
-     * Collection of {@link FilterResolvable}.
+     * Collection of {@link Filter}.
      * @name FilterManager#collection
      * @type {Discord.Collection<string, DisTubeVoice>}
      */
@@ -1793,28 +1765,18 @@ var _FilterManager = class _FilterManager extends BaseManager {
    */
   add(filterOrFilters, override = false) {
     if (Array.isArray(filterOrFilters)) {
-      const resolvedFilters = filterOrFilters.map((f) => __privateMethod(this, _validate, validate_fn).call(this, f));
-      const newFilters = resolvedFilters.reduceRight((unique, o) => {
-        if (!unique.some((obj) => obj === o && obj.name === o) && !unique.some((obj) => obj !== o.name && obj.name !== o.name)) {
-          if (!this.has(o))
-            unique.push(o);
-          if (this.has(o) && override) {
-            this.remove(o);
-            unique.push(o);
-          }
-        }
-        return unique;
-      }, []).reverse();
-      return this.set([...this.collection.values(), ...newFilters]);
-    } else if (typeof filterOrFilters === "string") {
-      return this.set([...this.collection.values(), filterOrFilters]);
-    }
-    throw new DisTubeError(
-      "INVALID_TYPE",
-      ["FilterResolvable", "Array<FilterResolvable>"],
-      filterOrFilters,
-      "filterOrFilters"
-    );
+      for (const filter of filterOrFilters) {
+        const ft = __privateMethod(this, _resolve, resolve_fn).call(this, filter);
+        if (override || !this.has(ft))
+          this.collection.set(ft.name, ft);
+      }
+    } else {
+      const ft = __privateMethod(this, _resolve, resolve_fn).call(this, filterOrFilters);
+      if (override || !this.has(ft))
+        this.collection.set(ft.name, ft);
+    }
+    __privateMethod(this, _apply, apply_fn).call(this);
+    return this;
   }
   /**
    * Clear enabled filters of the manager
@@ -1832,9 +1794,9 @@ var _FilterManager = class _FilterManager extends BaseManager {
     if (!Array.isArray(filters))
       throw new DisTubeError("INVALID_TYPE", "Array<FilterResolvable>", filters, "filters");
     this.collection.clear();
-    for (const filter of filters) {
-      const resolved = __privateMethod(this, _validate, validate_fn).call(this, filter);
-      this.collection.set(__privateMethod(this, _resolveName, resolveName_fn).call(this, resolved), resolved);
+    for (const f of filters) {
+      const filter = __privateMethod(this, _resolve, resolve_fn).call(this, f);
+      this.collection.set(filter.name, filter);
     }
     __privateMethod(this, _apply, apply_fn).call(this);
     return this;
@@ -1845,18 +1807,10 @@ var _FilterManager = class _FilterManager extends BaseManager {
    * @returns {FilterManager}
    */
   remove(filterOrFilters) {
-    if (Array.isArray(filterOrFilters)) {
-      filterOrFilters.map(__privateGet(this, _removeFn, removeFn_get));
-    } else if (typeof filterOrFilters === "string") {
-      __privateGet(this, _removeFn, removeFn_get).call(this, filterOrFilters);
-    } else {
-      throw new DisTubeError(
-        "INVALID_TYPE",
-        ["FilterResolvable", "Array<FilterResolvable>"],
-        filterOrFilters,
-        "filterOrFilters"
-      );
-    }
+    if (Array.isArray(filterOrFilters))
+      filterOrFilters.forEach((f) => __privateMethod(this, _removeFn, removeFn_fn).call(this, f));
+    else
+      __privateMethod(this, _removeFn, removeFn_fn).call(this, filterOrFilters);
     __privateMethod(this, _apply, apply_fn).call(this);
     return this;
   }
@@ -1866,46 +1820,52 @@ var _FilterManager = class _FilterManager extends BaseManager {
    * @returns {boolean}
    */
   has(filter) {
-    return this.collection.has(__privateMethod(this, _resolveName, resolveName_fn).call(this, filter));
+    return this.collection.has(typeof filter === "string" ? filter : __privateMethod(this, _resolve, resolve_fn).call(this, filter).name);
   }
   /**
-   * Array of enabled filter name
+   * Array of enabled filter names
    * @type {Array<string>}
    * @readonly
    */
   get names() {
-    return this.collection.map((f) => __privateMethod(this, _resolveName, resolveName_fn).call(this, f));
+    return [...this.collection.keys()];
   }
+  /**
+   * Array of enabled filters
+   * @type {Array<Filter>}
+   * @readonly
+   */
   get values() {
-    return this.collection.map((f) => __privateMethod(this, _resolveValue, resolveValue_fn).call(this, f));
+    return [...this.collection.values()];
+  }
+  get ffmpegArgs() {
+    return this.size ? ["-af", this.values.map((f) => f.value).join(",")] : [];
   }
   toString() {
     return this.names.toString();
   }
 };
-_validate = new WeakSet();
-validate_fn = /* @__PURE__ */ __name(function(filter) {
-  if (typeof filter === "string" && Object.prototype.hasOwnProperty.call(this.distube.filters, filter) || typeof filter === "object" && typeof filter.name === "string" && typeof filter.value === "string") {
+_resolve = new WeakSet();
+resolve_fn = /* @__PURE__ */ __name(function(filter) {
+  if (typeof filter === "object" && typeof filter.name === "string" && typeof filter.value === "string") {
     return filter;
   }
+  if (typeof filter === "string" && Object.prototype.hasOwnProperty.call(this.distube.filters, filter)) {
+    return {
+      name: filter,
+      value: this.distube.filters[filter]
+    };
+  }
   throw new DisTubeError("INVALID_TYPE", "FilterResolvable", filter, "filter");
-}, "#validate");
-_resolveName = new WeakSet();
-resolveName_fn = /* @__PURE__ */ __name(function(filter) {
-  return typeof filter === "string" ? filter : filter.name;
-}, "#resolveName");
-_resolveValue = new WeakSet();
-resolveValue_fn = /* @__PURE__ */ __name(function(filter) {
-  return typeof filter === "string" ? this.distube.filters[filter] : filter.value;
-}, "#resolveValue");
+}, "#resolve");
 _apply = new WeakSet();
 apply_fn = /* @__PURE__ */ __name(function() {
   this.queue.beginTime = this.queue.currentTime;
   this.queues.playSong(this.queue);
 }, "#apply");
 _removeFn = new WeakSet();
-removeFn_get = /* @__PURE__ */ __name(function() {
-  return (f) => this.collection.delete(__privateMethod(this, _resolveName, resolveName_fn).call(this, __privateMethod(this, _validate, validate_fn).call(this, f)));
+removeFn_fn = /* @__PURE__ */ __name(function(f) {
+  return this.collection.delete(__privateMethod(this, _resolve, resolve_fn).call(this, f).name);
 }, "#removeFn");
 __name(_FilterManager, "FilterManager");
 var FilterManager = _FilterManager;
@@ -1987,9 +1947,12 @@ var _QueueManager = class _QueueManager extends GuildIdManager {
    */
   createStream(queue) {
     const { duration, formats, isLive, source, streamURL } = queue.songs[0];
-    const ffmpegArgs = queue.filters.size ? ["-af", queue.filters.values.join(",")] : void 0;
-    const seek = duration ? queue.beginTime : void 0;
-    const streamOptions = { ffmpegArgs, seek, isLive, type: this.options.streamType };
+    const streamOptions = {
+      ffmpegArgs: queue.filters.ffmpegArgs,
+      seek: duration ? queue.beginTime : void 0,
+      isLive,
+      type: this.options.streamType
+    };
     if (source === "youtube")
       return DisTubeStream.YouTube(formats, streamOptions);
     return DisTubeStream.DirectLink(streamURL, streamOptions);
@@ -2255,7 +2218,7 @@ var _Queue = class _Queue extends DisTubeBase {
       this.songs.splice(position, 0, song);
     }
     if (Array.isArray(song))
-      song.map((s) => delete s.formats);
+      song.forEach((s) => delete s.formats);
     else
       delete song.formats;
     return this;
@@ -2638,15 +2601,15 @@ function toSecond(input) {
     return 0;
   if (typeof input !== "string")
     return Number(input) || 0;
-  if (input.match(/:/g)) {
+  if (input.includes(":")) {
     const time = input.split(":").reverse();
-    let s = 0;
+    let seconds = 0;
     for (let i = 0; i < 3; i++)
       if (time[i])
-        s += Number(time[i].replace(/[^\d.]+/g, "")) * Math.pow(60, i);
+        seconds += Number(time[i].replace(/[^\d.]+/g, "")) * Math.pow(60, i);
     if (time.length > 3)
-      s += Number(time[3].replace(/[^\d.]+/g, "")) * 24 * 60 * 60;
-    return s;
+      seconds += Number(time[3].replace(/[^\d.]+/g, "")) * 24 * 60 * 60;
+    return seconds;
   } else {
     return Number(input.replace(/[^\d.]+/g, "")) || 0;
   }
@@ -2699,23 +2662,23 @@ function isSnowflake(id) {
 }
 __name(isSnowflake, "isSnowflake");
 function isMemberInstance(member) {
-  return !!member && isSnowflake(member.id) && isSnowflake(member.guild?.id) && isSnowflake(member.user?.id) && member.id === member.user.id;
+  return Boolean(member) && isSnowflake(member.id) && isSnowflake(member.guild?.id) && isSnowflake(member.user?.id) && member.id === member.user.id;
 }
 __name(isMemberInstance, "isMemberInstance");
 function isTextChannelInstance(channel) {
-  return !!channel && isSnowflake(channel.id) && isSnowflake(channel.guildId) && typeof channel.name === "string" && import_discord3.Constants.TextBasedChannelTypes.includes(channel.type) && "messages" in channel && typeof channel.send === "function";
+  return Boolean(channel) && isSnowflake(channel.id) && isSnowflake(channel.guildId || channel.guild?.id) && import_discord3.Constants.TextBasedChannelTypes.includes(channel.type) && typeof channel.send === "function" && (typeof channel.nsfw === "boolean" || typeof channel.parent?.nsfw === "boolean");
 }
 __name(isTextChannelInstance, "isTextChannelInstance");
 function isMessageInstance(message) {
-  return !!message && isSnowflake(message.id) && isSnowflake(message.guildId) && isMemberInstance(message.member) && isTextChannelInstance(message.channel) && import_discord3.Constants.NonSystemMessageTypes.includes(message.type) && message.member.id === message.author?.id;
+  return Boolean(message) && isSnowflake(message.id) && isSnowflake(message.guildId || message.guild?.id) && isMemberInstance(message.member) && isTextChannelInstance(message.channel) && import_discord3.Constants.NonSystemMessageTypes.includes(message.type) && message.member.id === message.author?.id;
 }
 __name(isMessageInstance, "isMessageInstance");
 function isSupportedVoiceChannel(channel) {
-  return !!channel && isSnowflake(channel.id) && isSnowflake(channel.guildId) && import_discord3.Constants.VoiceBasedChannelTypes.includes(channel.type);
+  return Boolean(channel) && isSnowflake(channel.id) && isSnowflake(channel.guildId || channel.guild?.id) && import_discord3.Constants.VoiceBasedChannelTypes.includes(channel.type);
 }
 __name(isSupportedVoiceChannel, "isSupportedVoiceChannel");
 function isGuildInstance(guild) {
-  return !!guild && isSnowflake(guild.id) && isSnowflake(guild.ownerId) && typeof guild.name === "string";
+  return Boolean(guild) && isSnowflake(guild.id) && isSnowflake(guild.ownerId) && typeof guild.name === "string";
 }
 __name(isGuildInstance, "isGuildInstance");
 function resolveGuildId(resolvable) {
@@ -2737,7 +2700,7 @@ function resolveGuildId(resolvable) {
 }
 __name(resolveGuildId, "resolveGuildId");
 function isClientInstance(client) {
-  return !!client && typeof client.login === "function";
+  return Boolean(client) && typeof client.login === "function";
 }
 __name(isClientInstance, "isClientInstance");
 function checkInvalidKey(target, source, sourceName) {
@@ -2771,6 +2734,7 @@ function isNsfwChannel(channel) {
   return channel.nsfw;
 }
 __name(isNsfwChannel, "isNsfwChannel");
+var isTruthy = /* @__PURE__ */ __name((x) => Boolean(x), "isTruthy");
 
 // src/plugin/DirectLink.ts
 var import_undici = require("undici");
@@ -2786,8 +2750,7 @@ var _DirectLinkPlugin = class _DirectLinkPlugin extends ExtractorPlugin {
     }
     return false;
   }
-  // eslint-disable-next-line @typescript-eslint/require-await
-  async resolve(url, options = {}) {
+  resolve(url, options = {}) {
     url = url.replace(/\/+$/, "");
     return new Song(
       {
@@ -2806,23 +2769,11 @@ var DirectLinkPlugin = _DirectLinkPlugin;
 var import_ytsr = __toESM(require("@distube/ytsr"));
 var import_tiny_typed_emitter2 = require("tiny-typed-emitter");
 var { version } = require_package();
+var _getQueue, getQueue_fn;
 var _DisTube = class _DisTube extends import_tiny_typed_emitter2.TypedEmitter {
-  /**
-   * Create a new DisTube class.
-   * @param {Discord.Client} client Discord.JS client
-   * @param {DisTubeOptions} [otp] Custom DisTube options
-   * @throws {DisTubeError}
-   * @example
-   * const Discord = require('discord.js'),
-   *     DisTube = require('distube'),
-   *     client = new Discord.Client();
-   * // Create a new DisTube
-   * const distube = new DisTube.default(client, { searchSongs: 10 });
-   * // client.DisTube = distube // make it access easily
-   * client.login("Your Discord Bot Token")
-   */
   constructor(client, otp = {}) {
     super();
+    __privateAdd(this, _getQueue);
     __publicField(this, "handler");
     __publicField(this, "options");
     __publicField(this, "client");
@@ -2843,7 +2794,7 @@ var _DisTube = class _DisTube extends import_tiny_typed_emitter2.TypedEmitter {
     this.filters = { ...defaultFilters, ...this.options.customFilters };
     if (this.options.directLink)
       this.options.plugins.push(new DirectLinkPlugin());
-    this.options.plugins.map((p) => p.init(this));
+    this.options.plugins.forEach((p) => p.init(this));
     this.extractorPlugins = this.options.plugins.filter((p) => p.type === "extractor");
     this.customPlugins = this.options.plugins.filter((p) => p.type === "custom");
   }
@@ -2903,7 +2854,7 @@ var _DisTube = class _DisTube extends import_tiny_typed_emitter2.TypedEmitter {
       throw new DisTubeError("INVALID_TYPE", "Discord.GuildMember", member, "options.member");
     }
     const queue = this.getQueue(voiceChannel);
-    const queuing = !!queue && !queue._taskQueue.hasResolveTask;
+    const queuing = queue && !queue._taskQueue.hasResolveTask;
     if (queuing)
       await queue?._taskQueue.queuing(true);
     try {
@@ -2979,13 +2930,13 @@ ${e.message}`;
       const promises = filteredSongs.map(
         (song) => this.handler.resolve(song, { member, metadata }).catch(() => void 0)
       );
-      resolvedSongs = (await Promise.all(promises)).filter((s) => !!s);
+      resolvedSongs = (await Promise.all(promises)).filter((s) => Boolean(s));
     } else {
       const resolved = [];
       for (const song of filteredSongs) {
         resolved.push(await this.handler.resolve(song, { member, metadata }).catch(() => void 0));
       }
-      resolvedSongs = resolved.filter((s) => !!s);
+      resolvedSongs = resolved.filter((s) => Boolean(s));
     }
     return new Playlist(resolvedSongs, { member, properties, metadata });
   }
@@ -3014,7 +2965,7 @@ ${e.message}`;
       throw new DisTubeError("INVALID_TYPE", "boolean", opts.safeSearch, "options.safeSearch");
     }
     try {
-      const search = await (0, import_ytsr.default)(string, opts);
+      const search = await (0, import_ytsr.default)(string, { ...opts, requestOptions: { headers: { cookie: this.handler.ytCookie } } });
       const results = search.items.map((i) => {
         if (i.type === "video")
           return new SearchResultVideo(i);
@@ -3058,10 +3009,7 @@ ${e.message}`;
    * @throws {Error}
    */
   pause(guild) {
-    const q = this.getQueue(guild);
-    if (!q)
-      throw new DisTubeError("NO_QUEUE");
-    return q.pause();
+    return __privateMethod(this, _getQueue, getQueue_fn).call(this, guild).pause();
   }
   /**
    * Resume the guild stream
@@ -3070,10 +3018,7 @@ ${e.message}`;
    * @throws {Error}
    */
   resume(guild) {
-    const q = this.getQueue(guild);
-    if (!q)
-      throw new DisTubeError("NO_QUEUE");
-    return q.resume();
+    return __privateMethod(this, _getQueue, getQueue_fn).call(this, guild).resume();
   }
   /**
    * Stop the guild stream
@@ -3092,10 +3037,7 @@ ${e.message}`;
    * });
    */
   stop(guild) {
-    const q = this.getQueue(guild);
-    if (!q)
-      throw new DisTubeError("NO_QUEUE");
-    return q.stop();
+    return __privateMethod(this, _getQueue, getQueue_fn).call(this, guild).stop();
   }
   /**
    * Set the guild stream's volume
@@ -3113,10 +3055,7 @@ ${e.message}`;
    * });
    */
   setVolume(guild, percent) {
-    const q = this.getQueue(guild);
-    if (!q)
-      throw new DisTubeError("NO_QUEUE");
-    return q.setVolume(percent);
+    return __privateMethod(this, _getQueue, getQueue_fn).call(this, guild).setVolume(percent);
   }
   /**
    * Skip the playing song if there is a next song in the queue.
@@ -3135,10 +3074,7 @@ ${e.message}`;
    * });
    */
   skip(guild) {
-    const q = this.getQueue(guild);
-    if (!q)
-      throw new DisTubeError("NO_QUEUE");
-    return q.skip();
+    return __privateMethod(this, _getQueue, getQueue_fn).call(this, guild).skip();
   }
   /**
    * Play the previous song
@@ -3155,10 +3091,7 @@ ${e.message}`;
    * });
    */
   previous(guild) {
-    const q = this.getQueue(guild);
-    if (!q)
-      throw new DisTubeError("NO_QUEUE");
-    return q.previous();
+    return __privateMethod(this, _getQueue, getQueue_fn).call(this, guild).previous();
   }
   /**
    * Shuffle the guild queue songs
@@ -3174,10 +3107,7 @@ ${e.message}`;
    * });
    */
   shuffle(guild) {
-    const q = this.getQueue(guild);
-    if (!q)
-      throw new DisTubeError("NO_QUEUE");
-    return q.shuffle();
+    return __privateMethod(this, _getQueue, getQueue_fn).call(this, guild).shuffle();
   }
   /**
    * Jump to the song number in the queue.
@@ -3198,10 +3128,7 @@ ${e.message}`;
    * });
    */
   jump(guild, num) {
-    const q = this.getQueue(guild);
-    if (!q)
-      throw new DisTubeError("NO_QUEUE");
-    return q.jump(num);
+    return __privateMethod(this, _getQueue, getQueue_fn).call(this, guild).jump(num);
   }
   /**
    * Set the repeat mode of the guild queue.\
@@ -3237,10 +3164,7 @@ ${e.message}`;
    * message.channel.send("Set repeat mode to `" + mode + "`");
    */
   setRepeatMode(guild, mode) {
-    const q = this.getQueue(guild);
-    if (!q)
-      throw new DisTubeError("NO_QUEUE");
-    return q.setRepeatMode(mode);
+    return __privateMethod(this, _getQueue, getQueue_fn).call(this, guild).setRepeatMode(mode);
   }
   /**
    * Toggle autoplay mode
@@ -3259,11 +3183,9 @@ ${e.message}`;
    * });
    */
   toggleAutoplay(guild) {
-    const q = this.getQueue(guild);
-    if (!q)
-      throw new DisTubeError("NO_QUEUE");
-    q.autoplay = !q.autoplay;
-    return q.autoplay;
+    const queue = __privateMethod(this, _getQueue, getQueue_fn).call(this, guild);
+    queue.autoplay = !queue.autoplay;
+    return queue.autoplay;
   }
   /**
    * Add related song to the queue
@@ -3271,10 +3193,7 @@ ${e.message}`;
    * @returns {Promise<Song>} The guild queue
    */
   addRelatedSong(guild) {
-    const q = this.getQueue(guild);
-    if (!q)
-      throw new DisTubeError("NO_QUEUE");
-    return q.addRelatedSong();
+    return __privateMethod(this, _getQueue, getQueue_fn).call(this, guild).addRelatedSong();
   }
   /**
    * Set the playing time to another position
@@ -3291,10 +3210,7 @@ ${e.message}`;
    * });
    */
   seek(guild, time) {
-    const q = this.getQueue(guild);
-    if (!q)
-      throw new DisTubeError("NO_QUEUE");
-    return q.seek(time);
+    return __privateMethod(this, _getQueue, getQueue_fn).call(this, guild).seek(time);
   }
   /**
    * Emit error event
@@ -3314,6 +3230,13 @@ ${e.message}`;
     }
   }
 };
+_getQueue = new WeakSet();
+getQueue_fn = /* @__PURE__ */ __name(function(guild) {
+  const queue = this.getQueue(guild);
+  if (!queue)
+    throw new DisTubeError("NO_QUEUE");
+  return queue;
+}, "#getQueue");
 __name(_DisTube, "DisTube");
 var DisTube = _DisTube;
 // Annotate the CommonJS export names for ESM import in node:
@@ -3361,6 +3284,7 @@ var DisTube = _DisTube;
   isSnowflake,
   isSupportedVoiceChannel,
   isTextChannelInstance,
+  isTruthy,
   isURL,
   isVoiceChannelEmpty,
   objectKeys,