joan/Haha-Yes
1
0
Fork 0
forked from Supositware/Haha-Yes
Code Pull requests Activity

Added prompt and use url type

Browse source 
Signed-off-by: loicbersier <loic.bersier1@gmail.com>
This commit is contained in:
loicbersier 2020-07-19 11:43:29 +02:00
parent c857d36c65
commit 6da1ba9cfb
1 changed files with 27 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
commands/utility/screenshot.js
View file

@ -12,7 +12,11 @@ class screenshotCommand extends Command {
args: [ args: [
{ {
id: 'url', id: 'url',
type: 'string' type: 'url',
prompt: {
start: 'Please send a link of which website you want to take a screenshot of.',
retry: 'This does not look like an url, please try again.'
}
}, },
{ {
id: 'fullpage', id: 'fullpage',
@ -20,7 +24,6 @@ class screenshotCommand extends Command {
flag: '--full' flag: '--full'
} }
], ],
channel: 'guild',
description: { description: {
content: 'Take a screenshot of a website. Need to start with http(s)://. Use --full to take a full page capture', content: 'Take a screenshot of a website. Need to start with http(s)://. Use --full to take a full page capture',
usage: '[link to a website] [optional: --full]', usage: '[link to a website] [optional: --full]',
@ -30,19 +33,15 @@ class screenshotCommand extends Command {
} }
async exec(message, args) { async exec(message, args) {
if (args.url.includes('config.json')) return message.channel.send('I don\'t think so'); let url = args.url.href;
if (url.includes('config.json')) return message.channel.send('I don\'t think so');
let Embed = this.client.util.embed() let Embed = this.client.util.embed()
.setColor(message.member ? message.member.displayHexColor : 'NAVY') .setColor(message.member ? message.member.displayHexColor : 'NAVY')
.setTitle(args.url); .setTitle(url);
let loadingmsg = await message.channel.send('Taking a screenshot <a:loadingmin:527579785212329984>'); let loadingmsg = await message.channel.send('Taking a screenshot <a:loadingmin:527579785212329984>');
// eslint-disable-next-line no-useless-escape await captureWebsite.file(url, `${os.tmpdir()}/${message.id}.jpg`, {
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.includes('http')) args.url = 'http://' + args.url;
console.log(args.url);
if (args.url.match(urlregex)) { // Only allow link with http/https
await captureWebsite.file(args.url, `${os.tmpdir()}/${message.id}.jpg`, {
type: 'jpeg', type: 'jpeg',
headers: { headers: {
'Accept-Language': 'en-GB' 'Accept-Language': 'en-GB'
@ -63,10 +62,6 @@ class screenshotCommand extends Command {
return message.channel.send(Embed); return message.channel.send(Embed);
} }
}); });
} else {
loadingmsg.delete();
return message.channel.send('The URL you used doesn\'t correspond to a website!');
}
} }
} }
module.exports = screenshotCommand; module.exports = screenshotCommand;