Nomchy/discord.js
1
0
Fork 0
mirror of https://github.com/discordjs/discord.js.git synced 2026-03-17 20:13:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add arrow-parens eslint rule & fix inconsistencies

Browse Source
This commit is contained in:
Crawl
2017-03-13 15:56:00 +01:00
parent cee0d58fb8
commit 4ef0ec491c
5 changed files with 41 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.eslintrc.json
View File

@@ -11,6 +11,9 @@
"no-extra-parens": ["warn", "all", { "no-extra-parens": ["warn", "all", {
"nestedBinaryExpressions": false "nestedBinaryExpressions": false
}], }],
"arrow-parens": ["error", "as-needed", {
"requireForBlockBody": false
}],
"valid-jsdoc": ["error", { "valid-jsdoc": ["error", {
"requireReturn": false, "requireReturn": false,
"requireReturnDescription": false, "requireReturnDescription": false,

4
src/client/rest/RESTMethods.js
View File

@@ -99,7 +99,7 @@ class RESTMethods {
const messages = []; const messages = [];
(function sendChunk(list, index) { (function sendChunk(list, index) {
const options = index === list.length ? { tts, embed } : { tts }; const options = index === list.length ? { tts, embed } : { tts };
chan.send(list[index], options, index === list.length ? file : null).then((message) => { chan.send(list[index], options, index === list.length ? file : null).then(message => {
messages.push(message); messages.push(message);
if (index >= list.length - 1) return resolve(messages); if (index >= list.length - 1) return resolve(messages);
return sendChunk(list, ++index); return sendChunk(list, ++index);
@@ -856,7 +856,7 @@ class RESTMethods {
acceptInvite(code) { acceptInvite(code) {
if (code.id) code = code.id; if (code.id) code = code.id;
return new Promise((resolve, reject) => return new Promise((resolve, reject) =>
this.rest.makeRequest('post', Constants.Endpoints.invite(code), true).then((res) => { this.rest.makeRequest('post', Constants.Endpoints.invite(code), true).then(res => {
const handler = guild => { const handler = guild => {
if (guild.id === res.id) { if (guild.id === res.id) {
resolve(guild); resolve(guild);

2
src/client/voice/VoiceBroadcast.js
View File

@@ -301,7 +301,7 @@ class VoiceBroadcast extends VolumeInterface {
let packetMatrix = {}; let packetMatrix = {};
const getOpusPacket = (volume) => { const getOpusPacket = volume => {
if (packetMatrix[volume]) return packetMatrix[volume]; if (packetMatrix[volume]) return packetMatrix[volume];
const opusEncoder = this._encoders.get(volume); const opusEncoder = this._encoders.get(volume);

6
src/structures/Message.js
View File

@@ -278,7 +278,7 @@ class Message {
get cleanContent() { get cleanContent() {
return this.content return this.content
.replace(/@(everyone|here)/g, '@\u200b$1') .replace(/@(everyone|here)/g, '@\u200b$1')
.replace(/<@!?[0-9]+>/g, (input) => { .replace(/<@!?[0-9]+>/g, input => {
const id = input.replace(/<|!|>|@/g, ''); const id = input.replace(/<|!|>|@/g, '');
if (this.channel.type === 'dm' || this.channel.type === 'group') { if (this.channel.type === 'dm' || this.channel.type === 'group') {
return this.client.users.has(id) ? `@${this.client.users.get(id).username}` : input; return this.client.users.has(id) ? `@${this.client.users.get(id).username}` : input;
@@ -294,12 +294,12 @@ class Message {
return input; return input;
} }
}) })
.replace(/<#[0-9]+>/g, (input) => { .replace(/<#[0-9]+>/g, input => {
const channel = this.client.channels.get(input.replace(/<|#|>/g, '')); const channel = this.client.channels.get(input.replace(/<|#|>/g, ''));
if (channel) return `#${channel.name}`; if (channel) return `#${channel.name}`;
return input; return input;
}) })
.replace(/<@&[0-9]+>/g, (input) => { .replace(/<@&[0-9]+>/g, input => {
if (this.channel.type === 'dm' || this.channel.type === 'group') return input; if (this.channel.type === 'dm' || this.channel.type === 'group') return input;
const role = this.guild.roles.get(input.replace(/<|@|>|&/g, '')); const role = this.guild.roles.get(input.replace(/<|@|>|&/g, ''));
if (role) return `@${role.name}`; if (role) return `@${role.name}`;

64
src/util/Constants.js
View File

@@ -87,61 +87,61 @@ const Endpoints = exports.Endpoints = {
logout: `${API}/auth/logout`, logout: `${API}/auth/logout`,
gateway: `${API}/gateway`, gateway: `${API}/gateway`,
botGateway: `${API}/gateway/bot`, botGateway: `${API}/gateway/bot`,
invite: (id) => `${API}/invite/${id}`, invite: id => `${API}/invite/${id}`,
inviteLink: (id) => `https://discord.gg/${id}`, inviteLink: id => `https://discord.gg/${id}`,
assets: (asset) => `${HOST}/assets/${asset}`, assets: asset => `${HOST}/assets/${asset}`,
CDN: 'https://cdn.discordapp.com', CDN: 'https://cdn.discordapp.com',
// users // users
user: (userID) => `${API}/users/${userID}`, user: userID => `${API}/users/${userID}`,
userChannels: (userID) => `${Endpoints.user(userID)}/channels`, userChannels: userID => `${Endpoints.user(userID)}/channels`,
userProfile: (userID) => `${Endpoints.user(userID)}/profile`, userProfile: userID => `${Endpoints.user(userID)}/profile`,
avatar: (userID, avatar) => { avatar: (userID, avatar) => {
if (userID === '1') return avatar; if (userID === '1') return avatar;
return `${Endpoints.CDN}/avatars/${userID}/${avatar}.${avatar.startsWith('a_') ? 'gif' : 'jpg'}?size=1024`; return `${Endpoints.CDN}/avatars/${userID}/${avatar}.${avatar.startsWith('a_') ? 'gif' : 'jpg'}?size=1024`;
}, },
me: `${API}/users/@me`, me: `${API}/users/@me`,
meGuild: (guildID) => `${Endpoints.me}/guilds/${guildID}`, meGuild: guildID => `${Endpoints.me}/guilds/${guildID}`,
meChannels: `${API}/users/@me/channels`, meChannels: `${API}/users/@me/channels`,
meMentions: (limit, roles, everyone, guildID) => meMentions: (limit, roles, everyone, guildID) =>
`users/@me/mentions?limit=${limit}&roles=${roles}&everyone=${everyone}${guildID ? `&guild_id=${guildID}` : ''}`, `users/@me/mentions?limit=${limit}&roles=${roles}&everyone=${everyone}${guildID ? `&guild_id=${guildID}` : ''}`,
relationships: (userID) => `${Endpoints.user(userID)}/relationships`, relationships: userID => `${Endpoints.user(userID)}/relationships`,
note: (userID) => `${Endpoints.me}/notes/${userID}`, note: userID => `${Endpoints.me}/notes/${userID}`,
voiceRegions: `${API}/voice/regions`, voiceRegions: `${API}/voice/regions`,
// guilds // guilds
guilds: `${API}/guilds`, guilds: `${API}/guilds`,
guild: (guildID) => `${Endpoints.guilds}/${guildID}`, guild: guildID => `${Endpoints.guilds}/${guildID}`,
guildIcon: (guildID, hash) => `${Endpoints.CDN}/icons/${guildID}/${hash}.jpg`, guildIcon: (guildID, hash) => `${Endpoints.CDN}/icons/${guildID}/${hash}.jpg`,
guildSplash: (guildID, hash) => `${Endpoints.CDN}/splashes/${guildID}/${hash}.jpg`, guildSplash: (guildID, hash) => `${Endpoints.CDN}/splashes/${guildID}/${hash}.jpg`,
guildPrune: (guildID) => `${Endpoints.guild(guildID)}/prune`, guildPrune: guildID => `${Endpoints.guild(guildID)}/prune`,
guildEmbed: (guildID) => `${Endpoints.guild(guildID)}/embed`, guildEmbed: guildID => `${Endpoints.guild(guildID)}/embed`,
guildInvites: (guildID) => `${Endpoints.guild(guildID)}/invites`, guildInvites: guildID => `${Endpoints.guild(guildID)}/invites`,
guildRoles: (guildID) => `${Endpoints.guild(guildID)}/roles`, guildRoles: guildID => `${Endpoints.guild(guildID)}/roles`,
guildRole: (guildID, roleID) => `${Endpoints.guildRoles(guildID)}/${roleID}`, guildRole: (guildID, roleID) => `${Endpoints.guildRoles(guildID)}/${roleID}`,
guildBans: (guildID) => `${Endpoints.guild(guildID)}/bans`, guildBans: guildID => `${Endpoints.guild(guildID)}/bans`,
guildIntegrations: (guildID) => `${Endpoints.guild(guildID)}/integrations`, guildIntegrations: guildID => `${Endpoints.guild(guildID)}/integrations`,
guildMembers: (guildID) => `${Endpoints.guild(guildID)}/members`, guildMembers: guildID => `${Endpoints.guild(guildID)}/members`,
guildMember: (guildID, memberID) => `${Endpoints.guildMembers(guildID)}/${memberID}`, guildMember: (guildID, memberID) => `${Endpoints.guildMembers(guildID)}/${memberID}`,
guildMemberRole: (guildID, memberID, roleID) => `${Endpoints.guildMember(guildID, memberID)}/roles/${roleID}`, guildMemberRole: (guildID, memberID, roleID) => `${Endpoints.guildMember(guildID, memberID)}/roles/${roleID}`,
guildMemberNickname: (guildID) => `${Endpoints.guildMember(guildID, '@me')}/nick`, guildMemberNickname: guildID => `${Endpoints.guildMember(guildID, '@me')}/nick`,
guildChannels: (guildID) => `${Endpoints.guild(guildID)}/channels`, guildChannels: guildID => `${Endpoints.guild(guildID)}/channels`,
guildEmojis: (guildID) => `${Endpoints.guild(guildID)}/emojis`, guildEmojis: guildID => `${Endpoints.guild(guildID)}/emojis`,
guildEmoji: (guildID, emojiID) => `${Endpoints.guildEmojis(guildID)}/${emojiID}`, guildEmoji: (guildID, emojiID) => `${Endpoints.guildEmojis(guildID)}/${emojiID}`,
guildSearch: (guildID) => `${Endpoints.guild(guildID)}/messages/search`, guildSearch: guildID => `${Endpoints.guild(guildID)}/messages/search`,
guildVoiceRegions: (guildID) => `${Endpoints.guild(guildID)}/regions`, guildVoiceRegions: guildID => `${Endpoints.guild(guildID)}/regions`,
// channels // channels
channels: `${API}/channels`, channels: `${API}/channels`,
channel: (channelID) => `${Endpoints.channels}/${channelID}`, channel: channelID => `${Endpoints.channels}/${channelID}`,
channelMessages: (channelID) => `${Endpoints.channel(channelID)}/messages`, channelMessages: channelID => `${Endpoints.channel(channelID)}/messages`,
channelInvites: (channelID) => `${Endpoints.channel(channelID)}/invites`, channelInvites: channelID => `${Endpoints.channel(channelID)}/invites`,
channelTyping: (channelID) => `${Endpoints.channel(channelID)}/typing`, channelTyping: channelID => `${Endpoints.channel(channelID)}/typing`,
channelPermissions: (channelID) => `${Endpoints.channel(channelID)}/permissions`, channelPermissions: channelID => `${Endpoints.channel(channelID)}/permissions`,
channelMessage: (channelID, messageID) => `${Endpoints.channelMessages(channelID)}/${messageID}`, channelMessage: (channelID, messageID) => `${Endpoints.channelMessages(channelID)}/${messageID}`,
channelWebhooks: (channelID) => `${Endpoints.channel(channelID)}/webhooks`, channelWebhooks: channelID => `${Endpoints.channel(channelID)}/webhooks`,
channelSearch: (channelID) => `${Endpoints.channelMessages(channelID)}/search`, channelSearch: channelID => `${Endpoints.channelMessages(channelID)}/search`,
dmChannelRecipient: (channelID, recipientID) => `${Endpoints.channel(channelID)}/recipients/${recipientID}`, dmChannelRecipient: (channelID, recipientID) => `${Endpoints.channel(channelID)}/recipients/${recipientID}`,
@@ -160,11 +160,11 @@ const Endpoints = exports.Endpoints = {
webhook: (webhookID, token) => `${API}/webhooks/${webhookID}${token ? `/${token}` : ''}`, webhook: (webhookID, token) => `${API}/webhooks/${webhookID}${token ? `/${token}` : ''}`,
// oauth // oauth
oauth2Application: (appID) => `${API}/oauth2/applications/${appID}`, oauth2Application: appID => `${API}/oauth2/applications/${appID}`,
getApp: (id) => `${API}/oauth2/authorize?client_id=${id}`, getApp: id => `${API}/oauth2/authorize?client_id=${id}`,
// emoji // emoji
emoji: (emojiID) => `${Endpoints.CDN}/emojis/${emojiID}.png`, emoji: emojiID => `${Endpoints.CDN}/emojis/${emojiID}.png`,
}; };
/** /**