feat: added support for 'did you mean' on play and video to retry using that suggested query instead to get any results before failing and also this refractor from creating new MessageMedia from file buffer it now uses the MessageMedia fromFilePath

Author: mrepol742

src/commands/play.ts

@@ -3,10 +3,9 @@ import { Message } from "../../types/message";
 import fs from "fs";
 import path from "path";
 import { exec } from "child_process";
-// fallback import for compatibility
-// youtubei.js currently does not support ESM directly
-const { Innertube, UniversalCache, Utils } = require("youtubei.js");
+import { Innertube, UniversalCache, Utils } from "youtubei.js";
 import util from "util";
+import log from "../components/utils/log";
 
 const execPromise = util.promisify(exec);
 
@@ -19,6 +18,24 @@ export const info = {
   cooldown: 5000,
 };
 
+async function search(yt: Innertube, query: string) {
+  log.info("Play", `Searching for ${query}`);
+  const results = await yt.music.search(query, { type: "song" });
+  const firstShelf = results.contents?.[0];
+  const audio: any =
+    firstShelf && "contents" in firstShelf
+      ? firstShelf.contents?.[0]
+      : undefined;
+
+  if (audio?.id) return audio;
+
+  const didYouMean: any = results.contents?.[0].contents?.[0];
+  if (!didYouMean) return undefined;
+
+  log.info("Play", `Did you mean ${didYouMean.corrected_query.text}`);
+  return await search(yt, didYouMean.corrected_query.text);
+}
+
 export default async function play(msg: Message) {
   const query = msg.body.replace(/^play\b\s*/i, "").trim();
   if (!query) {
@@ -31,18 +48,17 @@ export default async function play(msg: Message) {
     generate_session_locally: true,
     player_id: "0004de42",
   });
-  const search = await yt.music.search(query, { type: "song" });
 
-  const audio = search.contents[0].contents[0];
-  if (!audio.id) {
-    await msg.reply("Unable to find resources for the given query.");
+  const audio: any = await search(yt, query);
+  if (!audio) {
+    await msg.reply(`No youtube music found for "${query}".`);
     return;
   }
 
-  // Only allow audios shorter than 10 minutes (600 seconds)
-  if (audio.length && audio.length.seconds > 600) {
+  // Only allow audios shorter than 20 minutes (1200 seconds)
+  if (audio.duration && audio.duration.seconds > 1200) {
     await msg.reply(
-      "Sorry, it seems like im not able to get any search results.",
+      "Opps, the music is quite long we can only process max of 20 minutes.",
     );
     return;
   }
@@ -57,7 +73,7 @@ export default async function play(msg: Message) {
 
   if (!stream) {
     await Promise.all([
-      msg.reply("Failed to download the audio stream."),
+      msg.reply("Failed to download the audio."),
       msg.react(""),
     ]);
     return;
@@ -88,13 +104,7 @@ export default async function play(msg: Message) {
     `ffmpeg -y -i "${tempPath}" -vn -ar 44100 -ac 2 -b:a 192k "${tempPath}.mp3"`,
   );
 
-  const audioBuffer = fs.readFileSync(`${tempPath}.mp3`);
-  const media = new MessageMedia(
-    "audio/mpeg",
-    audioBuffer.toString("base64"),
-    `${audio.title}.mp3`,
-  );
-
+  const media = MessageMedia.fromFilePath(`${tempPath}.mp3`);
   await msg.reply(media, undefined, {
     caption: audio.title,
   });

src/commands/video.ts

@@ -2,13 +2,8 @@ import { MessageMedia } from "whatsapp-web.js";
 import { Message } from "../../types/message";
 import fs from "fs";
 import path from "path";
-// fallback import for compatibility
-// youtubei.js currently does not support ESM directly
-const { Innertube, UniversalCache, Utils } = require("youtubei.js");
-import { exec } from "child_process";
-import util from "util";
-
-const execPromise = util.promisify(exec);
+import { Innertube, UniversalCache, Utils } from "youtubei.js";
+import log from "../components/utils/log";
 
 export const info = {
   command: "video",
@@ -19,6 +14,20 @@ export const info = {
   cooldown: 5000,
 };
 
+async function search(yt: Innertube, query: string) {
+  log.info("Video", `Searching for ${query}`);
+  const results = await yt.search(query, { type: "video" });
+  const video: any = results.results?.[0];
+
+  if (video?.video_id) return video;
+
+  const didYouMean: any = results.results?.[0];
+  if (!didYouMean) return undefined;
+
+  log.info("Video", `Did you mean ${didYouMean.corrected_query.text}`);
+  return await search(yt, didYouMean.corrected_query.text);
+}
+
 export default async function (msg: Message) {
   const query = msg.body.replace(/^video\b\s*/i, "").trim();
   if (!query) {
@@ -31,20 +40,17 @@ export default async function (msg: Message) {
     generate_session_locally: true,
     player_id: "0004de42",
   });
-  const search = await yt.search(query, { type: "video" });
 
-  const video = search.results[0];
-  if (!video.video_id) {
-    await msg.reply(
-      "Sorry, it seems like im not able to get any search results.",
-    );
+  const video: any = await search(yt, query);
+  if (!video) {
+    await msg.reply(`No youtube video found for "${query}".`);
     return;
   }
 
-  // Only allow videos shorter than 10 minutes (600 seconds)
-  if (video.length && video.length.seconds > 600) {
+  // Only allow audios shorter than 20 minutes (1200 seconds)
+  if (video.duration && video.duration.seconds > 1200) {
     await msg.reply(
-      "Sorry, only videos shorter than 10 minutes can be downloaded.",
+      "Opps, the video is quite long we can only process max of 20 minutes.",
     );
     return;
   }
@@ -58,7 +64,10 @@ export default async function (msg: Message) {
   });
 
   if (!stream) {
-    await msg.reply("Failed to download the video stream.");
+    await Promise.all([
+      msg.reply("Failed to download the video."),
+      msg.react(""),
+    ]);
     return;
   }
 
@@ -79,15 +88,9 @@ export default async function (msg: Message) {
     writeStream.on("error", reject);
   });
 
-  const audioBuffer = fs.readFileSync(`${tempPath}`);
-  const media = new MessageMedia(
-    "audio/mpeg",
-    audioBuffer.toString("base64"),
-    `${video.title}.mp4`,
-  );
-
+  const media = MessageMedia.fromFilePath(tempPath);
   await msg.reply(media, undefined, {
-    caption: `${video.title}`,
+    caption: video.title.text,
   });
 
   fs.promises.unlink(tempPath);