lavalink-client 1.2.3 → 1.2.5

package/dist/cjs/structures/LavalinkManager.d.ts

@@ -16,7 +16,7 @@ export interface BotClientOptions {
     /** Bot Client Username */
     username?: string;
     /** So users can pass entire objects / classes */
-    [x: string | number | symbol | undefined]: unknown;
+    [x: string | number | symbol]: unknown;
 }
 export interface ManagerPlayerOptions {
     /** If the Lavalink Volume should be decremented by x number */

package/dist/cjs/structures/LavalinkManager.js

@@ -93,7 +93,7 @@ class LavalinkManager extends events_1.EventEmitter {
         this.utils = new Utils_1.ManagerUtils(this);
         // use the validators
         this.applyOptions(options);
-        this.validateOptions(options);
+        this.validateOptions(this.options);
         // create classes
         this.nodeManager = new NodeManager_1.NodeManager(this);
     }

package/dist/cjs/structures/Node.js

@@ -99,7 +99,7 @@ class LavalinkNode {
     }
     async search(query, requestUser) {
         const Query = this.NodeManager.LavalinkManager.utils.transformQuery(query);
-        this.NodeManager.LavalinkManager.utils.validateQueryString(this, Query.query);
+        this.NodeManager.LavalinkManager.utils.validateQueryString(this, Query.query, Query.source);
         if (Query.source)
             this.NodeManager.LavalinkManager.utils.validateSourceString(this, Query.source);
         if (["bcsearch", "bandcamp"].includes(Query.source)) {
@@ -653,7 +653,6 @@ class LavalinkNode {
     }
     async trackStuck(player, track, payload) {
         this.NodeManager.LavalinkManager.emit("trackStuck", player, track, payload);
-        return; // trackEnd get's executed too
         // If there are no songs in the queue
         if (!player.queue.tracks.length && (player.repeatMode === "off" || player.get("internal_stopPlaying")))
             return this.queueEnd(player, track, payload);
@@ -667,7 +666,7 @@ class LavalinkNode {
     }
     async trackError(player, track, payload) {
         this.NodeManager.LavalinkManager.emit("trackError", player, track, payload);
-        return; // trackEnd get's executed too
+        return; // get's handled by trackEnd
         // If there are no songs in the queue
         if (!player.queue.tracks.length && (player.repeatMode === "off" || player.get("internal_stopPlaying")))
             return this.queueEnd(player, track, payload);

package/dist/cjs/structures/Utils.d.ts

@@ -100,7 +100,7 @@ export declare class ManagerUtils {
      */
     isUnresolvedTrackQuery(data: UnresolvedQuery | any): boolean;
     getClosestTrack(data: UnresolvedTrack, player: Player): Promise<Track | undefined>;
-    validateQueryString(node: LavalinkNode, queryString: string): void;
+    validateQueryString(node: LavalinkNode, queryString: string, sourceString?: LavalinkSearchPlatform): void;
     transformQuery(query: SearchQuery): {
         query: string;
         source: any;

package/dist/cjs/structures/Utils.js

@@ -180,15 +180,16 @@ class ManagerUtils {
     async getClosestTrack(data, player) {
         return getClosestTrack(data, player);
     }
-    validateQueryString(node, queryString) {
+    validateQueryString(node, queryString, sourceString) {
         if (!node.info)
             throw new Error("No Lavalink Node was provided");
         if (!node.info.sourceManagers?.length)
             throw new Error("Lavalink Node, has no sourceManagers enabled");
-        // checks for blacklisted links / domains / queries
-        if (this.LavalinkManager.options?.linksBlacklist?.length > 0 && this.LavalinkManager.options?.linksBlacklist.some(v => (typeof v === "string" && (queryString.toLowerCase().includes(v.toLowerCase()) || v.toLowerCase().includes(queryString.toLowerCase()))) || (0, types_1.isRegExp)(v) && v.test(queryString))) {
-            throw new Error(`Query string contains a link / word which is blacklisted.`);
-        }
+        if (sourceString === "speak" && queryString.length > 100)
+            // checks for blacklisted links / domains / queries
+            if (this.LavalinkManager.options?.linksBlacklist?.length > 0 && this.LavalinkManager.options?.linksBlacklist.some(v => (typeof v === "string" && (queryString.toLowerCase().includes(v.toLowerCase()) || v.toLowerCase().includes(queryString.toLowerCase()))) || (0, types_1.isRegExp)(v) && v.test(queryString))) {
+                throw new Error(`Query string contains a link / word which is blacklisted.`);
+            }
         if (!/^https?:\/\//.test(queryString))
             return;
         else if (this.LavalinkManager.options?.linksAllowed === false)

package/dist/esm/structures/LavalinkManager.d.ts

@@ -16,7 +16,7 @@ export interface BotClientOptions {
     /** Bot Client Username */
     username?: string;
     /** So users can pass entire objects / classes */
-    [x: string | number | symbol | undefined]: unknown;
+    [x: string | number | symbol]: unknown;
 }
 export interface ManagerPlayerOptions {
     /** If the Lavalink Volume should be decremented by x number */

package/dist/esm/structures/LavalinkManager.js

@@ -90,7 +90,7 @@ export class LavalinkManager extends EventEmitter {
         this.utils = new ManagerUtils(this);
         // use the validators
         this.applyOptions(options);
-        this.validateOptions(options);
+        this.validateOptions(this.options);
         // create classes
         this.nodeManager = new NodeManager(this);
     }

package/dist/esm/structures/Node.js

@@ -95,7 +95,7 @@ export class LavalinkNode {
     }
     async search(query, requestUser) {
         const Query = this.NodeManager.LavalinkManager.utils.transformQuery(query);
-        this.NodeManager.LavalinkManager.utils.validateQueryString(this, Query.query);
+        this.NodeManager.LavalinkManager.utils.validateQueryString(this, Query.query, Query.source);
         if (Query.source)
             this.NodeManager.LavalinkManager.utils.validateSourceString(this, Query.source);
         if (["bcsearch", "bandcamp"].includes(Query.source)) {
@@ -649,7 +649,6 @@ export class LavalinkNode {
     }
     async trackStuck(player, track, payload) {
         this.NodeManager.LavalinkManager.emit("trackStuck", player, track, payload);
-        return; // trackEnd get's executed too
         // If there are no songs in the queue
         if (!player.queue.tracks.length && (player.repeatMode === "off" || player.get("internal_stopPlaying")))
             return this.queueEnd(player, track, payload);
@@ -663,7 +662,7 @@ export class LavalinkNode {
     }
     async trackError(player, track, payload) {
         this.NodeManager.LavalinkManager.emit("trackError", player, track, payload);
-        return; // trackEnd get's executed too
+        return; // get's handled by trackEnd
         // If there are no songs in the queue
         if (!player.queue.tracks.length && (player.repeatMode === "off" || player.get("internal_stopPlaying")))
             return this.queueEnd(player, track, payload);

package/dist/esm/structures/Utils.d.ts

@@ -100,7 +100,7 @@ export declare class ManagerUtils {
      */
     isUnresolvedTrackQuery(data: UnresolvedQuery | any): boolean;
     getClosestTrack(data: UnresolvedTrack, player: Player): Promise<Track | undefined>;
-    validateQueryString(node: LavalinkNode, queryString: string): void;
+    validateQueryString(node: LavalinkNode, queryString: string, sourceString?: LavalinkSearchPlatform): void;
     transformQuery(query: SearchQuery): {
         query: string;
         source: any;

package/dist/esm/structures/Utils.js

@@ -176,15 +176,16 @@ export class ManagerUtils {
     async getClosestTrack(data, player) {
         return getClosestTrack(data, player);
     }
-    validateQueryString(node, queryString) {
+    validateQueryString(node, queryString, sourceString) {
         if (!node.info)
             throw new Error("No Lavalink Node was provided");
         if (!node.info.sourceManagers?.length)
             throw new Error("Lavalink Node, has no sourceManagers enabled");
-        // checks for blacklisted links / domains / queries
-        if (this.LavalinkManager.options?.linksBlacklist?.length > 0 && this.LavalinkManager.options?.linksBlacklist.some(v => (typeof v === "string" && (queryString.toLowerCase().includes(v.toLowerCase()) || v.toLowerCase().includes(queryString.toLowerCase()))) || isRegExp(v) && v.test(queryString))) {
-            throw new Error(`Query string contains a link / word which is blacklisted.`);
-        }
+        if (sourceString === "speak" && queryString.length > 100)
+            // checks for blacklisted links / domains / queries
+            if (this.LavalinkManager.options?.linksBlacklist?.length > 0 && this.LavalinkManager.options?.linksBlacklist.some(v => (typeof v === "string" && (queryString.toLowerCase().includes(v.toLowerCase()) || v.toLowerCase().includes(queryString.toLowerCase()))) || isRegExp(v) && v.test(queryString))) {
+                throw new Error(`Query string contains a link / word which is blacklisted.`);
+            }
         if (!/^https?:\/\//.test(queryString))
             return;
         else if (this.LavalinkManager.options?.linksAllowed === false)

package/dist/types/structures/LavalinkManager.d.ts

@@ -16,7 +16,7 @@ export interface BotClientOptions {
     /** Bot Client Username */
     username?: string;
     /** So users can pass entire objects / classes */
-    [x: string | number | symbol | undefined]: unknown;
+    [x: string | number | symbol]: unknown;
 }
 export interface ManagerPlayerOptions {
     /** If the Lavalink Volume should be decremented by x number */

package/dist/types/structures/Utils.d.ts

@@ -100,7 +100,7 @@ export declare class ManagerUtils {
      */
     isUnresolvedTrackQuery(data: UnresolvedQuery | any): boolean;
     getClosestTrack(data: UnresolvedTrack, player: Player): Promise<Track | undefined>;
-    validateQueryString(node: LavalinkNode, queryString: string): void;
+    validateQueryString(node: LavalinkNode, queryString: string, sourceString?: LavalinkSearchPlatform): void;
     transformQuery(query: SearchQuery): {
         query: string;
         source: any;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lavalink-client",
-  "version": "1.2.3",
+  "version": "1.2.5",
   "description": "Easy, flexible and feature-rich lavalink@v4 Client. Both for Beginners and Proficients.",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",