Skip to content

Commit ce22ac7

Browse files
committed
chore: Update eslint-config-sora to v3 and lint all files
1 parent b5efc65 commit ce22ac7

40 files changed

+671
-670
lines changed

commands/about.js

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
const { MessageEmbed } = require('discord.js');
2-
const { Command } = require('discord-akairo');
3-
const { colors } = require('../config.js');
4-
const permissionsUtil = require('../util/permissions.js');
1+
const { MessageEmbed } = require('discord.js')
2+
const { Command } = require('discord-akairo')
3+
const { colors } = require('../config.js')
4+
const permissionsUtil = require('../util/permissions.js')
55

66
module.exports = class AboutCommand extends Command {
77
constructor() {
88
super('about', {
99
aliases: ['about'],
1010
description: 'Display some basic info about Rinon!',
11-
});
11+
})
1212
}
1313

1414
async exec(message) {
15-
const { client } = message;
16-
const owner = await client.users.fetch(client.ownerID);
17-
const invite = await client.generateInvite({ permissions: permissionsUtil.required });
18-
const [normal, animated] = client.emojis.cache.partition(emoji => !emoji.animated);
15+
const { client } = message
16+
const owner = await client.users.fetch(client.ownerID)
17+
const invite = await client.generateInvite({ permissions: permissionsUtil.required })
18+
const [normal, animated] = client.emojis.cache.partition(emoji => !emoji.animated)
1919

2020
const embed = new MessageEmbed()
2121
.setColor(colors.pink)
@@ -26,8 +26,8 @@ module.exports = class AboutCommand extends Command {
2626
`[Invite](${invite}) | [GitHub](https://github.com/Danktuary/Rinon)`,
2727
].join('\n'))
2828
.addField('Servers', `${client.guilds.cache.size} (${client.hubServer.serverList})`, true)
29-
.addField('Emojis', `${normal.size + animated.size} (${normal.size} normal, ${animated.size} animated)`, true);
29+
.addField('Emojis', `${normal.size + animated.size} (${normal.size} normal, ${animated.size} animated)`, true)
3030

31-
return message.util.send(embed);
31+
return message.util.send(embed)
3232
}
33-
};
33+
}

commands/add.js

+53-53
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
const { Command } = require('discord-akairo');
2-
const Canvas = require('canvas');
3-
const fetch = require('node-fetch');
4-
const parseInput = require('../util/parseInput.js');
5-
const validators = require('../util/validators.js');
6-
const regexes = require('../util/regexes.js');
1+
const { Command } = require('discord-akairo')
2+
const Canvas = require('canvas')
3+
const fetch = require('node-fetch')
4+
const parseInput = require('../util/parseInput.js')
5+
const validators = require('../util/validators.js')
6+
const regexes = require('../util/regexes.js')
77

88
module.exports = class AddCommand extends Command {
99
constructor() {
@@ -33,122 +33,122 @@ module.exports = class AddCommand extends Command {
3333
],
3434
},
3535
},
36-
});
36+
})
3737
}
3838

3939
async exec(message, args) {
40-
let validatedArgs;
41-
const { hubServer } = this.client;
40+
let validatedArgs
41+
const { hubServer } = this.client
4242

4343
try {
44-
validatedArgs = await this.validate(message, args);
44+
validatedArgs = await this.validate(message, args)
4545
} catch (error) {
46-
return message.channel.send(error.message || error);
46+
return message.channel.send(error.message || error)
4747
}
4848

49-
let { name, url, imageData } = validatedArgs;
49+
let { name, url, imageData } = validatedArgs
5050

5151
if (message.util.parsed.alias === 'reverse' || args.reverse) {
5252
if (!name.toLowerCase().endsWith('reverse')) {
53-
name = await this.modifyEmojiName(message, name);
53+
name = await this.modifyEmojiName(message, name)
5454
}
5555

56-
url = this.reverseImage(await imageData.buffer(), url);
56+
url = this.reverseImage(await imageData.buffer(), url)
5757
}
5858

5959
try {
60-
await hubServer.polls.emoji.create({ message, name, url });
60+
await hubServer.polls.emoji.create({ message, name, url })
6161
} catch (error) {
62-
const owner = await this.client.users.fetch(this.client.ownerID);
63-
const anger = ['tch', 'meguAngry', 'angry', 'nyanrage', 'WeebRage'];
64-
const angryEmoji = this.client.emojis.cache.filter(emoji => anger.includes(emoji.name)).random();
65-
return message.channel.send(`<@${owner.id}>: ${error.message} ${angryEmoji}`);
62+
const owner = await this.client.users.fetch(this.client.ownerID)
63+
const anger = ['tch', 'meguAngry', 'angry', 'nyanrage', 'WeebRage']
64+
const angryEmoji = this.client.emojis.cache.filter(emoji => anger.includes(emoji.name)).random()
65+
return message.channel.send(`<@${owner.id}>: ${error.message} ${angryEmoji}`)
6666
}
6767

68-
const response = [`Done! Others can now vote on your request in ${hubServer.votingChannel}.`];
68+
const response = [`Done! Others can now vote on your request in ${hubServer.votingChannel}.`]
6969

7070
if (message.guild.id !== hubServer.guild.id) {
71-
response[0] = `${response[0].slice(0, -1)} in **${hubServer.guild.name}**.`;
72-
response.push(`If you can\'t open the channel link, send \`${this.handler.prefix}server 1\` for an invite.`);
71+
response[0] = `${response[0].slice(0, -1)} in **${hubServer.guild.name}**.`
72+
response.push(`If you can\'t open the channel link, send \`${this.handler.prefix}server 1\` for an invite.`)
7373
}
7474

75-
return message.channel.send(response.join('\n'));
75+
return message.channel.send(response.join('\n'))
7676
}
7777

7878
async validate(message, { name, url }) {
7979
if (!name && !url) {
8080
throw new Error([
8181
'You need to provide: an emoji, a name and an emoji, a name and an image URL, or a name and an image file!',
8282
`For example: \`${this.handler.prefix}add AiSmug https://i.imgur.com/8jGJzmd.png\`.`,
83-
].join('\n'));
83+
].join('\n'))
8484
}
8585

86-
const { name: emojiName, url: imageURL } = parseInput.fromAny({ first: name, last: url, attachments: message.attachments });
86+
const { name: emojiName, url: imageURL } = parseInput.fromAny({ first: name, last: url, attachments: message.attachments })
8787

8888
if (emojiName.length < 2 || emojiName.length > 32) {
89-
throw new RangeError('An emoji name needs to be between 2 and 32 characters long.');
89+
throw new RangeError('An emoji name needs to be between 2 and 32 characters long.')
9090
}
9191

92-
const imageData = await fetch(imageURL);
92+
const imageData = await fetch(imageURL)
9393

9494
if (!imageData.ok) {
95-
throw new Error('That image link doesn\'t seem to be working.');
95+
throw new Error('That image link doesn\'t seem to be working.')
9696
} else if (imageData.headers.get('content-length') > (256 * 1024)) {
97-
throw new RangeError('That file surpasses the 256kb file size limit! Please resize it and try again.');
97+
throw new RangeError('That file surpasses the 256kb file size limit! Please resize it and try again.')
9898
}
9999

100100
if (regexes.blobInit.test(emojiName) && !regexes.blob.test(emojiName)) {
101-
validators.blobs(emojiName, imageURL, imageData);
101+
validators.blobs(emojiName, imageURL, await imageData.buffer())
102102
}
103103

104-
await validators.duplicates(message, emojiName);
104+
await validators.duplicates(message, emojiName)
105105

106-
return { name: emojiName, url: imageURL, imageData };
106+
return { name: emojiName, url: imageURL, imageData }
107107
}
108108

109109
reverseImage(imageData, url) {
110110
if (!regexes.png.test(url)) {
111-
throw new RangeError('I can only reverse PNG images!');
111+
throw new RangeError('I can only reverse PNG images!')
112112
}
113113

114-
const canvas = new Canvas.createCanvas(128, 128);
115-
const ctx = canvas.getContext('2d');
114+
const canvas = new Canvas.createCanvas(128, 128)
115+
const ctx = canvas.getContext('2d')
116116

117-
const image = new Canvas.Image();
118-
image.src = imageData;
117+
const image = new Canvas.Image()
118+
image.src = imageData
119119

120-
canvas.width = image.width;
121-
canvas.height = image.height;
120+
canvas.width = image.width
121+
canvas.height = image.height
122122

123-
ctx.translate(canvas.width, 0);
124-
ctx.scale(-1, 1);
125-
ctx.drawImage(image, 0, 0);
123+
ctx.translate(canvas.width, 0)
124+
ctx.scale(-1, 1)
125+
ctx.drawImage(image, 0, 0)
126126

127-
return canvas.toBuffer();
127+
return canvas.toBuffer()
128128
}
129129

130130
async modifyEmojiName(message, name) {
131131
await message.channel.send([
132132
'Your emoji name doesn\'t end with "reverse". Do you want me to modify it for you?',
133133
'1) Yes, with "reverse" - 2) Yes, with "Reverse" - 3) No',
134-
].join('\n'));
134+
].join('\n'))
135135

136-
const options = { max: 1, time: 20000, errors: ['time'] };
136+
const options = { max: 1, time: 20000, errors: ['time'] }
137137
const filter = m => {
138-
return ['yes', 'y', 'no', 'n', '1', '2', '3'].includes(m.content.toLowerCase()) && m.author.id === message.author.id;
139-
};
138+
return ['yes', 'y', 'no', 'n', '1', '2', '3'].includes(m.content.toLowerCase()) && m.author.id === message.author.id
139+
}
140140

141141
try {
142-
const responses = await message.channel.awaitMessages(filter, options);
143-
const response = responses.first().content.toLowerCase();
142+
const responses = await message.channel.awaitMessages(filter, options)
143+
const response = responses.first().content.toLowerCase()
144144

145145
if (response && ['yes', 'y', '1', '2'].includes(response)) {
146-
return response !== '2' ? `${name}reverse` : `${name}Reverse`;
146+
return response !== '2' ? `${name}reverse` : `${name}Reverse`
147147
}
148148
} catch (error) {
149-
await message.channel.send('You didn\'t reply in time, leaving emoji name as is.');
149+
await message.channel.send('You didn\'t reply in time, leaving emoji name as is.')
150150
}
151151

152-
return name;
152+
return name
153153
}
154-
};
154+
}

commands/approve.js

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const { Command } = require('discord-akairo');
1+
const { Command } = require('discord-akairo')
22

33
module.exports = class ApproveCommand extends Command {
44
constructor() {
@@ -25,18 +25,18 @@ module.exports = class ApproveCommand extends Command {
2525
],
2626
},
2727
},
28-
});
28+
})
2929
}
3030

3131
async exec(message, { input, mode }) {
32-
if (message.util.parsed.alias === 'approve-emoji') mode = 'emoji';
33-
else if (message.util.parsed.alias === 'approve-rename') mode = 'rename';
34-
else if (!['emoji', 'rename'].includes(mode)) mode = 'emoji';
32+
if (message.util.parsed.alias === 'approve-emoji') mode = 'emoji'
33+
else if (message.util.parsed.alias === 'approve-rename') mode = 'rename'
34+
else if (!['emoji', 'rename'].includes(mode)) mode = 'emoji'
3535

36-
const poll = this.client.hubServer.polls[mode];
37-
const { message: pollMessage } = await poll.search(input);
36+
const poll = this.client.hubServer.polls[mode]
37+
const { message: pollMessage } = await poll.search(input)
3838

39-
await poll.approve({ message: pollMessage });
40-
return message.channel.send('Done!');
39+
await poll.approve({ message: pollMessage })
40+
return message.channel.send('Done!')
4141
}
42-
};
42+
}

commands/async-eval.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const { Command } = require('discord-akairo');
1+
const { Command } = require('discord-akairo')
22

33
module.exports = class AsyncEvalCommand extends Command {
44
constructor() {
@@ -12,11 +12,11 @@ module.exports = class AsyncEvalCommand extends Command {
1212
match: 'content',
1313
},
1414
],
15-
});
15+
})
1616
}
1717

1818
async exec(message, args) {
19-
const code = `(async () => { ${args.code} })()`;
20-
return this.client.commandHandler.findCommand('eval').exec(message, { code });
19+
const code = `(async () => { ${args.code} })()`
20+
return this.client.commandHandler.findCommand('eval').exec(message, { code })
2121
}
22-
};
22+
}

commands/deny.js

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const { Command } = require('discord-akairo');
1+
const { Command } = require('discord-akairo')
22

33
module.exports = class DenyCommand extends Command {
44
constructor() {
@@ -24,27 +24,27 @@ module.exports = class DenyCommand extends Command {
2424
],
2525
},
2626
},
27-
});
27+
})
2828
}
2929

3030
async exec(message, { input, mode }) {
31-
if (['deny-emoji', 'cancel-emoji'].includes(message.util.parsed.alias)) mode = 'emoji';
32-
else if (['deny-rename', 'cancel-rename'].includes(message.util.parsed.alias)) mode = 'rename';
33-
else if (!['emoji', 'rename'].includes(mode)) mode = 'emoji';
31+
if (['deny-emoji', 'cancel-emoji'].includes(message.util.parsed.alias)) mode = 'emoji'
32+
else if (['deny-rename', 'cancel-rename'].includes(message.util.parsed.alias)) mode = 'rename'
33+
else if (!['emoji', 'rename'].includes(mode)) mode = 'emoji'
3434

35-
const { hubServer, ownerID } = this.client;
36-
const poll = hubServer.polls[mode];
37-
const { pollData, message: pollMessage } = await poll.search(input);
35+
const { hubServer, ownerID } = this.client
36+
const poll = hubServer.polls[mode]
37+
const { pollData, message: pollMessage } = await poll.search(input)
3838

3939
if (![pollData.authorID, ownerID].includes(message.author.id)) {
40-
return message.util.reply('you can\'t cancel polls you didn\'t create.');
40+
return message.util.reply('you can\'t cancel polls you didn\'t create.')
4141
}
4242

4343
await poll.deny({
4444
message: pollMessage,
4545
reason: `Cancelled by ${message.author.id === pollData.authorID ? 'poll author' : 'bot owner'}.`,
46-
});
46+
})
4747

48-
return message.channel.send('Done!');
48+
return message.channel.send('Done!')
4949
}
50-
};
50+
}

commands/emoji-search.js

+18-18
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
const { MessageEmbed } = require('discord.js');
2-
const { Command } = require('discord-akairo');
3-
const { colors } = require('../config.js');
4-
const emojiUtil = require('../util/emoji.js');
1+
const { MessageEmbed } = require('discord.js')
2+
const { Command } = require('discord-akairo')
3+
const { colors } = require('../config.js')
4+
const emojiUtil = require('../util/emoji.js')
55

66
module.exports = class EmojiSearchCommand extends Command {
77
constructor() {
@@ -22,43 +22,43 @@ module.exports = class EmojiSearchCommand extends Command {
2222
examples: ['EmojiName', ':emoji:'],
2323
},
2424
},
25-
});
25+
})
2626
}
2727

2828
async exec(message, { query }) {
29-
const searchTerm = emojiUtil.parseSearchQuery(query);
29+
const searchTerm = emojiUtil.parseSearchQuery(query)
3030

3131
if (searchTerm.length < 2 || searchTerm.length > 32) {
32-
return message.util.send('A search term needs to be between 2 and 32 characters long.');
32+
return message.util.send('A search term needs to be between 2 and 32 characters long.')
3333
}
3434

35-
const emojis = emojiUtil.search(message.client.emojis.cache, searchTerm);
36-
if (!emojis.size) return message.util.send('I couldn\'t find any requests that match your search term!');
37-
return message.util.send(this.formatResponse(emojis));
35+
const emojis = emojiUtil.search(message.client.emojis.cache, searchTerm)
36+
if (!emojis.size) return message.util.send('I couldn\'t find any requests that match your search term!')
37+
return message.util.send(this.formatResponse(emojis))
3838
}
3939

4040
formatResponse(emojis) {
41-
const inviteText = `If you want an invite to any of these servers, use the \`${this.handler.prefix}server\` command!`;
41+
const inviteText = `If you want an invite to any of these servers, use the \`${this.handler.prefix}server\` command!`
4242

4343
if (emojis.size <= (25 / 3)) {
44-
const embed = new MessageEmbed().setColor(colors.pink).setDescription(inviteText);
44+
const embed = new MessageEmbed().setColor(colors.pink).setDescription(inviteText)
4545

4646
for (const emoji of emojis.values()) {
4747
embed
4848
.addField('Name', emoji.name, true)
4949
.addField('Emoji', emoji.toString(), true)
50-
.addField('Found in', emoji.guild.name, true);
50+
.addField('Found in', emoji.guild.name, true)
5151
}
5252

53-
return { embed };
53+
return { embed }
5454
}
5555

56-
const content = [`${inviteText}\n`];
56+
const content = [`${inviteText}\n`]
5757

5858
for (const emoji of emojis.values()) {
59-
content.push(`${emoji.name}: ${emoji} (Found in **${emoji.guild.name}**)`);
59+
content.push(`${emoji.name}: ${emoji} (Found in **${emoji.guild.name}**)`)
6060
}
6161

62-
return { content: content.join('\n'), split: '\n' };
62+
return { content: content.join('\n'), split: '\n' }
6363
}
64-
};
64+
}

0 commit comments

Comments
 (0)