More music/sound work

commands/boi.js

@@ -1,7 +1,7 @@
 const soundPlayer = require("../utils/soundplayer.js");
 
 exports.run = async (message) => {
-  return soundPlayer.play("./assets/audio/boi.ogg", message);
+  return await soundPlayer.play("./assets/audio/boi.ogg", message);
 };
 
 exports.aliases = ["boy", "neutron", "hugh"];

commands/boom.js

@@ -1,7 +1,7 @@
 const soundPlayer = require("../utils/soundplayer.js");
 
 exports.run = async (message) => {
-  return soundPlayer.play("./assets/audio/boom.ogg", message);
+  return await soundPlayer.play("./assets/audio/boom.ogg", message);
 };
 
 exports.aliases = ["thud", "vine"];

commands/bruh.js

@@ -1,7 +1,7 @@
 const soundPlayer = require("../utils/soundplayer.js");
 
 exports.run = async (message) => {
-  return soundPlayer.play("./assets/audio/bruh.ogg", message);
+  return await soundPlayer.play("./assets/audio/bruh.ogg", message);
 };
 
 exports.aliases = ["bro"];

commands/explosion.js

@@ -1,7 +1,7 @@
 const soundPlayer = require("../utils/soundplayer.js");
 
 exports.run = async (message) => {
-  return soundPlayer.play("./assets/audio/explosion.ogg", message);
+  return await soundPlayer.play("./assets/audio/explosion.ogg", message);
 };
 
 exports.category = 6;

commands/fakeping.js

@@ -1,7 +1,7 @@
 const soundPlayer = require("../utils/soundplayer.js");
 
 exports.run = async (message) => {
-  return soundPlayer.play("./assets/audio/ping.ogg", message);
+  return await soundPlayer.play("./assets/audio/ping.ogg", message);
 };
 
 exports.aliases = ["notification", "notif"];

commands/fart.js

@@ -1,7 +1,7 @@
 const soundPlayer = require("../utils/soundplayer.js");
 
 exports.run = async (message) => {
-  return soundPlayer.play("./assets/audio/fart.ogg", message);
+  return await soundPlayer.play("./assets/audio/fart.ogg", message);
 };
 
 exports.aliases = ["toot"];

commands/fbi.js

@@ -1,7 +1,7 @@
 const soundPlayer = require("../utils/soundplayer.js");
 
 exports.run = async (message) => {
-  return soundPlayer.play("./assets/audio/fbi.ogg", message);
+  return await soundPlayer.play("./assets/audio/fbi.ogg", message);
 };
 
 exports.aliases = ["openup"];

commands/mail.js

@@ -1,7 +1,7 @@
 const soundPlayer = require("../utils/soundplayer.js");
 
 exports.run = async (message) => {
-  return soundPlayer.play("./assets/audio/mail.ogg", message);
+  return await soundPlayer.play("./assets/audio/mail.ogg", message);
 };
 
 exports.aliases = ["yougotmail", "youvegotmail", "aol"];

commands/nowplaying.js

@@ -1,7 +1,7 @@
 const soundPlayer = require("../utils/soundplayer.js");
 
 exports.run = async (message) => {
-  soundPlayer.playing(message);
+  await soundPlayer.playing(message);
 };
 
 exports.aliases = ["playing", "np"];

commands/oof.js

@@ -1,7 +1,7 @@
 const soundPlayer = require("../utils/soundplayer.js");
 
 exports.run = async (message) => {
-  return soundPlayer.play("./assets/audio/oof.ogg", message);
+  return await soundPlayer.play("./assets/audio/oof.ogg", message);
 };
 
 exports.aliases = ["roblox", "commitdie"];

commands/pause.js

@@ -1,7 +1,7 @@
 const soundPlayer = require("../utils/soundplayer.js");
 
 exports.run = async (message) => {
-  soundPlayer.pause(message);
+  await soundPlayer.pause(message);
 };
 
 exports.aliases = ["resume"];

commands/play.js

@@ -1,8 +1,12 @@
 const soundPlayer = require("../utils/soundplayer.js");
+const urlRegex = /(?:\w+:)?\/\/(\S+)/;
+const searchRegex = /^(sc|yt)search:/;
 
 exports.run = async (message, args) => {
   if (!args[0]) return `${message.author.mention}, you need to provide what you want to play!`;
-  soundPlayer.play(encodeURIComponent(args.join(" ").trim()), message, true);
+  const query = args.join(" ").trim();
+  const search = urlRegex.test(query) ? query : (searchRegex.test(query) ? query : `ytsearch:${query}`);
+  await soundPlayer.play(encodeURIComponent(search), message, true);
 };
 
 exports.aliases = ["p"];

commands/queue.js

@@ -1,7 +1,7 @@
 const soundPlayer = require("../utils/soundplayer.js");
 
 exports.run = async (message) => {
-  soundPlayer.queue(message);
+  await soundPlayer.queue(message);
 };
 
 exports.aliases = ["q"];

commands/skip.js

@@ -1,7 +1,7 @@
 const soundPlayer = require("../utils/soundplayer.js");
 
 exports.run = async (message) => {
-  soundPlayer.skip(message);
+  await soundPlayer.skip(message);
 };
 
 exports.category = 7;

commands/stop.js

@@ -1,7 +1,7 @@
 const soundPlayer = require("../utils/soundplayer.js");
 
 exports.run = async (message) => {
-  soundPlayer.stop(message);
+  await soundPlayer.stop(message);
 };
 
 exports.aliases = ["disconnect"];

commands/winxp.js

@@ -1,7 +1,7 @@
 const soundPlayer = require("../utils/soundplayer.js");
 
 exports.run = async (message) => {
-  return soundPlayer.play("./assets/audio/winxp.ogg", message);
+  return await soundPlayer.play("./assets/audio/winxp.ogg", message);
 };
 
 exports.aliases = ["windows", "xp"];