Supositware/Haha-Yes
2
1
Fork 1
Code Issues Pull requests Projects Releases Activity

Loading message

Browse source
This commit is contained in:
loicbersier 2020-03-19 16:07:46 +01:00
parent 9c274f2cb8
commit 04e9bc26c0
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
commands/utility/screenshot.js
View file

@ -35,6 +35,8 @@ class screenshotCommand extends Command {
.setColor(message.member.displayHexColor) .setColor(message.member.displayHexColor)
.setTitle(args.url); .setTitle(args.url);
let loadingmsg = await message.channel.send('Taking a screenshot <a:loadingmin:527579785212329984>');
// eslint-disable-next-line no-useless-escape // eslint-disable-next-line no-useless-escape
let urlregex = new RegExp(/https?:\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_\+.~#?&//=]*)/); let urlregex = new RegExp(/https?:\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_\+.~#?&//=]*)/);
if (args.url.match(urlregex)) { // Only allow link with http/https if (args.url.match(urlregex)) { // Only allow link with http/https
@ -48,16 +50,19 @@ class screenshotCommand extends Command {
.catch((err) => { .catch((err) => {
console.error(err); console.error(err);
Embed.setDescription(err.toString()); Embed.setDescription(err.toString());
loadingmsg.delete();
return message.channel.send(Embed); return message.channel.send(Embed);
}) })
.then(() => { .then(() => {
if (fs.existsSync(`${os.tmpdir()}/${message.id}.jpg`)) { if (fs.existsSync(`${os.tmpdir()}/${message.id}.jpg`)) {
Embed.attachFiles([`${os.tmpdir()}/${message.id}.jpg`]); Embed.attachFiles([`${os.tmpdir()}/${message.id}.jpg`]);
Embed.setImage(`attachment://${message.id}.jpg`); Embed.setImage(`attachment://${message.id}.jpg`);
loadingmsg.delete();
return message.channel.send(Embed); return message.channel.send(Embed);
} }
}); });
} else { } else {
loadingmsg.delete();
return message.channel.send('The URL you used doesn\'t correspond to a website!'); return message.channel.send('The URL you used doesn\'t correspond to a website!');
} }
} }