murm/mrmBot-Matrix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Refactor URL handling in play

Browse source
This commit is contained in:
Essem 2022-01-26 23:02:18 -06:00
parent 593c132555
commit eca5c58af7
No known key found for this signature in database
GPG key ID: 7D497397CC3A2A8C
1 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

19
commands/music/play.js
View file

@ -1,15 +1,24 @@
import { play } from "../../utils/soundplayer.js"; import { play } from "../../utils/soundplayer.js";
import MusicCommand from "../../classes/musicCommand.js"; import MusicCommand from "../../classes/musicCommand.js";
const urlRegex = /(?:\w+:)?\/\/(\S+)/;
const searchRegex = /^ytsearch:/;
class PlayCommand extends MusicCommand { class PlayCommand extends MusicCommand {
async run() { async run() {
if (!this.args[0] && this.message.attachments.length <= 0) return "You need to provide what you want to play!"; if (!this.args[0] && this.message.attachments.length <= 0) return "You need to provide what you want to play!";
const query = this.args.join(" ").trim(); let query = this.args.join(" ").trim();
const attachment = this.message.attachments[0]; const attachment = this.message.attachments[0];
const search = urlRegex.test(query) ? query : searchRegex.test(query) ? query : !this.args[0] && attachment ? attachment.url : `ytsearch:${query}`; if (query.startsWith("||") && query.endsWith("||")) {
return await play(this.client, search, this.message, true); query = query.substring(2, query.length - 2);
}
if (query.startsWith("<") && query.endsWith(">")) {
query = query.substring(1, query.length - 1);
}
try {
const url = new URL(query);
return await play(this.client, url, this.message, true);
} catch {
const search = searchRegex.startsWith("ytsearch:") ? query : !this.args[0] && attachment ? attachment.url : `ytsearch:${query}`;
return await play(this.client, search, this.message, true);
}
} }
static description = "Plays a song or adds it to the queue"; static description = "Plays a song or adds it to the queue";