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

Revert "rewrite ratelimiting and api route builder (#1667)"

Browse Source 
This reverts commit a2eeafc75d.
This commit is contained in:
Crawl
2017-07-26 23:00:46 +02:00
parent 317bf4f7cb
commit 07178a0a2a
20 changed files with 316 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/structures/GuildMember.js
View File

@@ -342,13 +342,13 @@ class GuildMember {
data.channel = null;
}
if (data.roles) data.roles = data.roles.map(role => role instanceof Role ? role.id : role);
let endpoint = this.client.api.guilds(this.guild.id);
let endpoint = this.client.api.guilds[this.guild.id];
if (this.user.id === this.client.user.id) {
const keys = Object.keys(data);
if (keys.length === 1 && keys[0] === 'nick') endpoint = endpoint.members('@me').nick;
else endpoint = endpoint.members(this.id);
if (keys.length === 1 && keys[0] === 'nick') endpoint = endpoint.members['@me'].nick;
else endpoint = endpoint.members[this.id];
} else {
endpoint = endpoint.members(this.id);
endpoint = endpoint.members[this.id];
}
return endpoint.patch({ data, reason }).then(newData => this.guild._updateMember(this, newData).mem);
}
@@ -402,7 +402,7 @@ class GuildMember {
if (!(role instanceof Role)) role = this.guild.roles.get(role);
if (!role) return Promise.reject(new TypeError('INVALID_TYPE', 'role', 'Role nor a Snowflake'));
if (this._roles.includes(role.id)) return Promise.resolve(this);
return this.client.api.guilds(this.guild.id).members(this.user.id).roles(role.id)
return this.client.api.guilds[this.guild.id].members[this.user.id].roles[role.id]
.put({ reason })
.then(() => this);
}
@@ -433,7 +433,7 @@ class GuildMember {
removeRole(role, reason) {
if (!(role instanceof Role)) role = this.guild.roles.get(role);
if (!role) return Promise.reject(new TypeError('INVALID_TYPE', 'role', 'Role nor a Snowflake'));
return this.client.api.guilds(this.guild.id).members(this.user.id).roles(role.id)
return this.client.api.guilds[this.guild.id].members[this.user.id].roles[role.id]
.delete({ reason })
.then(() => this);
}
@@ -492,7 +492,7 @@ class GuildMember {
* @returns {Promise<GuildMember>}
*/
kick(reason) {
return this.client.api.guilds(this.guild.id).members(this.user.id).delete({ reason })
return this.client.api.guilds[this.guild.id].members[this.user.id].delete({ reason })
.then(() =>
this.client.actions.GuildMemberRemove.handle({
guild_id: this.guild.id,