REST API speed improvement (#1577)

2026-03-09 16:13:31 +01:00 · 2017-07-01 04:14:17 -05:00
parent 6bc7b3e068
commit 5ecd5f7d69
25 changed files with 114 additions and 109 deletions
--- a/src/client/Client.js
+++ b/src/client/Client.js
@@ -50,13 +50,6 @@ class Client extends EventEmitter {
     */
    this.rest = new RESTManager(this);

-    /**
-     * API shortcut
-     * @type {Object}
-     * @private
-     */
-    this.api = this.rest.api;
-
    /**
     * The data manager of the client
     * @type {ClientDataManager}
@@ -198,6 +191,15 @@ class Client extends EventEmitter {
    return this.ws.connection ? this.ws.connection.lastPingTimestamp : 0;
  }

+  /**
+   * API shortcut
+   * @type {Object}
+   * @private
+   */
+  get api() {
+    return this.rest.api;
+  }
+
  /**
   * Current status of the client's connection to Discord
   * @type {?Status}
@@ -330,7 +332,7 @@ class Client extends EventEmitter {
   */
  fetchUser(id, cache = true) {
    if (this.users.has(id)) return Promise.resolve(this.users.get(id));
-    return this.api.users(id).get().then(data =>
+    return this.api.users[id].get().then(data =>
      cache ? this.dataManager.newUser(data) : new User(this, data)
    );
  }
@@ -342,7 +344,7 @@ class Client extends EventEmitter {
   */
  fetchInvite(invite) {
    const code = this.resolver.resolveInviteCode(invite);
-    return this.api.invites(code).get({ query: { with_counts: true } })
+    return this.api.invites[code].get({ query: { with_counts: true } })
      .then(data => new Invite(this, data));
  }

@@ -353,7 +355,7 @@ class Client extends EventEmitter {
   * @returns {Promise<Webhook>}
   */
  fetchWebhook(id, token) {
-    return this.api.webhooks(id, token).get().then(data => new Webhook(this, data));
+    return this.api.webhooks.opts(id, token).get().then(data => new Webhook(this, data));
  }

  /**
--- a/src/client/WebhookClient.js
+++ b/src/client/WebhookClient.js
@@ -34,13 +34,6 @@ class WebhookClient extends Webhook {
     */
    this.rest = new RESTManager(this);

-    /**
-     * API shortcut
-     * @type {Object}
-     * @private
-     */
-    this.api = this.rest.api;
-
    /**
     * The data resolver of the client
     * @type {ClientDataResolver}
@@ -63,6 +56,15 @@ class WebhookClient extends Webhook {
    this._intervals = new Set();
  }

+  /**
+   * API shortcut
+   * @type {Object}
+   * @private
+   */
+  get api() {
+    return this.rest.api;
+  }
+
  /**
   * Sets a timeout that will be automatically cancelled if the client is destroyed.
   * @param {Function} fn Function to execute
--- a/src/client/rest/APIRouter.js
+++ b/src/client/rest/APIRouter.js
@@ -1,37 +1,30 @@
 const util = require('util');

 const methods = ['get', 'post', 'delete', 'patch', 'put'];
-// Paramable exists so we don't return a function unless we actually need one #savingmemory
-const paramable = [
-  'channels', 'users', 'guilds', 'members',
-  'bans', 'emojis', 'pins', 'permissions',
-  'reactions', 'webhooks', 'messages',
-  'notes', 'roles', 'applications',
-  'invites', 'bot',
+const reflectors = [
+  'toString', 'valueOf', 'inspect', 'constructor',
+  Symbol.toPrimitive, util.inspect.custom,
 ];
-const reflectors = ['toString', 'valueOf', 'inspect', Symbol.toPrimitive, util.inspect.custom];

 module.exports = restManager => {
  const handler = {
    get(list, name) {
-      if (reflectors.includes(name)) return () => list.join('/');
-      if (paramable.includes(name)) {
+      if (name === 'opts') {
        function toReturn(...args) { // eslint-disable-line no-inner-declarations
-          list = list.concat(name);
-          for (const arg of args) {
-            if (arg !== null && typeof arg !== 'undefined') list = list.concat(arg);
-          }
+          list.push(...args.filter(x => x !== null && typeof x !== 'undefined'));
          return new Proxy(list, handler);
        }
        const directJoin = () => `${list.join('/')}/${name}`;
        for (const r of reflectors) toReturn[r] = directJoin;
        for (const method of methods) {
-          toReturn[method] = options => restManager.request(method, `${list.join('/')}/${name}`, options);
+          toReturn[method] = options => restManager.request(method, directJoin(), options);
        }
        return toReturn;
      }
+      if (reflectors.includes(name)) return () => list.join('/');
      if (methods.includes(name)) return options => restManager.request(name, list.join('/'), options);
-      return new Proxy(list.concat(name), handler);
+      list.push(name);
+      return new Proxy(list, handler);
    },
  };

--- a/src/client/rest/DiscordAPIError.js
+++ b/src/client/rest/DiscordAPIError.js
@@ -3,12 +3,18 @@
 * @extends Error
 */
 class DiscordAPIError extends Error {
-  constructor(error) {
+  constructor(path, error) {
    super();
    const flattened = error.errors ? `\n${this.constructor.flattenErrors(error.errors).join('\n')}` : '';
    this.name = 'DiscordAPIError';
    this.message = `${error.message}${flattened}`;

+    /**
+     * The path of the request relative to the HTTP endpoint
+     * @type {string}
+     */
+    this.path = path;
+
    /**
     * HTTP error code returned by Discord
     * @type {number}
--- a/src/client/rest/RESTManager.js
+++ b/src/client/rest/RESTManager.js
@@ -12,8 +12,10 @@ class RESTManager {
    this.userAgentManager = new UserAgentManager(this);
    this.rateLimitedEndpoints = {};
    this.globallyRateLimited = false;
+  }

-    this.api = mountApi(this);
+  get api() {
+    return mountApi(this);
  }

  destroy() {
--- a/src/client/rest/RequestHandlers/Burst.js
+++ b/src/client/rest/RequestHandlers/Burst.js
@@ -41,7 +41,7 @@ class BurstRequestHandler extends RequestHandler {
            this.resetTimeout = null;
          }, Number(res.headers['retry-after']) + this.client.options.restTimeOffset);
        } else {
-          item.reject(err.status === 400 ? new DiscordAPIError(res.body) : err);
+          item.reject(err.status === 400 ? new DiscordAPIError(res.request.path, res.body) : err);
          this.handle();
        }
      } else {
--- a/src/client/rest/RequestHandlers/Sequential.js
+++ b/src/client/rest/RequestHandlers/Sequential.js
@@ -65,7 +65,7 @@ class SequentialRequestHandler extends RequestHandler {
            }, Number(res.headers['retry-after']) + this.restManager.client.options.restTimeOffset);
            if (res.headers['x-ratelimit-global']) this.globalLimit = true;
          } else {
-            item.reject(err.status >= 400 && err.status < 500 ? new DiscordAPIError(res.body) : err);
+            item.reject(err.status >= 400 && err.status < 500 ? new DiscordAPIError(res.request.path, res.body) : err);
            resolve(err);
          }
        } else {
--- a/src/structures/Channel.js
+++ b/src/structures/Channel.js
@@ -62,7 +62,7 @@ class Channel {
   *  .catch(console.error); // Log error
   */
  delete() {
-    return this.client.api.channels(this.id).delete().then(() => this);
+    return this.client.api.channels[this.id].delete().then(() => this);
  }
 }

--- a/src/structures/ClientUser.js
+++ b/src/structures/ClientUser.js
@@ -91,7 +91,7 @@ class ClientUser extends User {
      if (data.new_password) _data.new_password = data.newPassword;
    }

-    return this.client.api.users('@me').patch({ data })
+    return this.client.api.users['@me'].patch({ data })
      .then(newData => this.client.actions.UserUpdate.handle(newData).updated);
  }

@@ -284,7 +284,7 @@ class ClientUser extends User {
    if (options.guild instanceof Guild) options.guild = options.guild.id;
    Util.mergeDefault({ limit: 25, roles: true, everyone: true, guild: null }, options);

-    return this.client.api.users('@me').mentions.get({ query: options })
+    return this.client.api.users['@me'].mentions.get({ query: options })
      .then(data => data.map(m => new Message(this.client.channels.get(m.channel_id), m, this.client)));
  }

@@ -351,7 +351,7 @@ class ClientUser extends User {
        return o;
      }, {}),
    } : { recipients: recipients.map(u => this.client.resolver.resolveUserID(u)) };
-    return this.client.api.users('@me').channels.post({ data })
+    return this.client.api.users['@me'].channels.post({ data })
      .then(res => new GroupDMChannel(this.client, res));
  }
 }
--- a/src/structures/ClientUserSettings.js
+++ b/src/structures/ClientUserSettings.js
@@ -32,7 +32,7 @@ class ClientUserSettings {
   * @returns {Promise<Object>}
   */
  update(name, value) {
-    return this.user.client.api.users('@me').settings.patch({ data: { [name]: value } });
+    return this.user.client.api.users['@me'].settings.patch({ data: { [name]: value } });
  }

  /**
--- a/src/structures/Emoji.js
+++ b/src/structures/Emoji.js
@@ -121,7 +121,7 @@ class Emoji {
   *  .catch(console.error);
   */
  edit(data, reason) {
-    return this.client.api.guilds(this.guild.id).emojis(this.id)
+    return this.client.api.guilds[this.guild.id].emojis(this.id)
      .patch({ data: {
        name: data.name,
        roles: data.roles ? data.roles.map(r => r.id ? r.id : r) : [],
--- a/src/structures/GroupDMChannel.js
+++ b/src/structures/GroupDMChannel.js
@@ -135,7 +135,7 @@ class GroupDMChannel extends Channel {
    const data = this.client.user.bot ?
      { nick, access_token: accessTokenOrUser } :
      { recipient: id };
-    return this.client.api.channels(this.id).recipients(id).put({ data })
+    return this.client.api.channels[this.id].recipients[id].put({ data })
    .then(() => this);
  }

--- a/src/structures/Guild.js
+++ b/src/structures/Guild.js
@@ -378,7 +378,7 @@ class Guild {
   * @returns {Promise<Collection<Snowflake, Object>>}
   */
  fetchBans() {
-    return this.client.api.guilds(this.id).bans.get().then(bans =>
+    return this.client.api.guilds[this.id].bans.get().then(bans =>
      bans.reduce((collection, ban) => {
        collection.set(ban.user.id, {
          reason: ban.reason,
@@ -394,7 +394,7 @@ class Guild {
   * @returns {Promise<Collection<string, Invite>>}
   */
  fetchInvites() {
-    return this.client.api.guilds(this.id).invites.get()
+    return this.client.api.guilds[this.id].invites.get()
    .then(inviteItems => {
      const invites = new Collection();
      for (const inviteItem of inviteItems) {
@@ -410,7 +410,7 @@ class Guild {
   * @returns {Collection<Snowflake, Webhook>}
   */
  fetchWebhooks() {
-    return this.client.api.guilds(this.id).webhooks.get().then(data => {
+    return this.client.api.guilds[this.id].webhooks.get().then(data => {
      const hooks = new Collection();
      for (const hook of data) hooks.set(hook.id, new Webhook(this.client, hook));
      return hooks;
@@ -422,7 +422,7 @@ class Guild {
   * @returns {Collection<string, VoiceRegion>}
   */
  fetchVoiceRegions() {
-    return this.client.api.guilds(this.id).regions.get().then(res => {
+    return this.client.api.guilds[this.id].regions.get().then(res => {
      const regions = new Collection();
      for (const region of res) regions.set(region.id, new VoiceRegion(region));
      return regions;
@@ -444,7 +444,7 @@ class Guild {
    if (options.after && options.after instanceof GuildAuditLogs.Entry) options.after = options.after.id;
    if (typeof options.type === 'string') options.type = GuildAuditLogs.Actions[options.type];

-    return this.client.api.guilds(this.id)['audit-logs'].get({ query: {
+    return this.client.api.guilds[this.id]['audit-logs'].get({ query: {
      before: options.before,
      after: options.after,
      limit: options.limit,
@@ -476,7 +476,7 @@ class Guild {
        options.roles = roles.map(role => role.id);
      }
    }
-    return this.client.api.guilds(this.id).members(user.id).put({ data: options })
+    return this.client.api.guilds[this.id].members[user.id].put({ data: options })
      .then(data => this.client.actions.GuildMemberGet.handle(this, data).member);
  }

@@ -490,7 +490,7 @@ class Guild {
    user = this.client.resolver.resolveUser(user);
    if (!user) return Promise.reject(new Error('User is not cached. Use Client.fetchUser first.'));
    if (this.members.has(user.id)) return Promise.resolve(this.members.get(user.id));
-    return this.client.api.guilds(this.id).members(user.id).get()
+    return this.client.api.guilds[this.id].members[user.id].get()
    .then(data => {
      if (cache) return this.client.actions.GuildMemberGet.handle(this, data).member;
      else return new GuildMember(this, data);
@@ -596,7 +596,7 @@ class Guild {
    if (typeof data.explicitContentFilter !== 'undefined') {
      _data.explicit_content_filter = Number(data.explicitContentFilter);
    }
-    return this.client.api.guilds(this.id).patch({ data: _data, reason })
+    return this.client.api.guilds[this.id].patch({ data: _data, reason })
    .then(newData => this.client.actions.GuildUpdate.handle(newData).updated);
  }

@@ -741,7 +741,7 @@ class Guild {
   * @returns {Promise<Guild>}
   */
  acknowledge() {
-    return this.client.api.guilds(this.id).ack
+    return this.client.api.guilds[this.id].ack
    .post({ data: { token: this.client.rest._ackToken } })
    .then(res => {
      if (res.token) this.client.rest._ackToken = res.token;
@@ -780,7 +780,7 @@ class Guild {
    if (options.days) options['delete-message-days'] = options.days;
    const id = this.client.resolver.resolveUserID(user);
    if (!id) return Promise.reject(new Error('Couldn\'t resolve the user ID to ban.'));
-    return this.client.api.guilds(this.id).bans(id).put({ query: options })
+    return this.client.api.guilds[this.id].bans[id].put({ query: options })
    .then(() => {
      if (user instanceof GuildMember) return user;
      const _user = this.client.resolver.resolveUser(id);
@@ -806,7 +806,7 @@ class Guild {
  unban(user, reason) {
    const id = this.client.resolver.resolveUserID(user);
    if (!id) throw new Error('BAN_RESOLVE_ID');
-    return this.client.api.guilds(this.id).bans(id).delete({ reason })
+    return this.client.api.guilds(this.id).bans[id].delete({ reason })
      .then(() => user);
  }

@@ -829,7 +829,7 @@ class Guild {
   */
  pruneMembers({ days = 7, dry = false, reason } = {}) {
    if (typeof days !== 'number') throw new TypeError('PRUNE_DAYS_TYPE');
-    return this.client.api.guilds(this.id).prune[dry ? 'get' : 'post']({ query: { days }, reason })
+    return this.client.api.guilds[this.id].prune[dry ? 'get' : 'post']({ query: { days }, reason })
      .then(data => data.pruned);
  }

@@ -864,7 +864,7 @@ class Guild {
        id: overwrite.id,
      }));
    }
-    return this.client.api.guilds(this.id).channels.post({
+    return this.client.api.guilds[this.id].channels.post({
      data: {
        name, type, permission_overwrites: overwrites,
      },
@@ -897,7 +897,7 @@ class Guild {
      };
    }

-    return this.client.api.guilds(this.id).channels.patch({ data: {
+    return this.client.api.guilds[this.id].channels.patch({ data: {
      guild_id: this.id,
      channels: channelPositions,
    } }).then(() =>
@@ -935,7 +935,7 @@ class Guild {
    if (data.color) data.color = Util.resolveColor(data.color);
    if (data.permissions) data.permissions = Permissions.resolve(data.permissions);

-    return this.client.api.guilds(this.id).roles.post({ data, reason }).then(role =>
+    return this.client.api.guilds[this.id].roles.post({ data, reason }).then(role =>
      this.client.actions.GuildRoleCreate.handle({
        guild_id: this.id,
        role,
@@ -964,7 +964,7 @@ class Guild {
    if (typeof attachment === 'string' && attachment.startsWith('data:')) {
      const data = { image: attachment, name };
      if (roles) data.roles = roles.map(r => r.id ? r.id : r);
-      return this.client.api.guilds(this.id).emojis.post({ data })
+      return this.client.api.guilds[this.id].emojis.post({ data })
        .then(emoji => this.client.actions.GuildEmojiCreate.handle(this, emoji).emoji);
    } else {
      return this.client.resolver.resolveBuffer(attachment)
@@ -982,7 +982,7 @@ class Guild {
   */
  deleteEmoji(emoji) {
    if (!(emoji instanceof Emoji)) emoji = this.emojis.get(emoji);
-    return this.client.api.guilds(this.id).emojis(emoji.id).delete()
+    return this.client.api.guilds(this.id).emojis[emoji.id].delete()
    .then(() => this.client.actions.GuildEmojiDelete.handle(emoji).data);
  }

@@ -997,7 +997,7 @@ class Guild {
   */
  leave() {
    if (this.ownerID === this.client.user.id) return Promise.reject(new Error('Guild is owned by the client.'));
-    return this.client.api.users('@me').guilds(this.id).delete()
+    return this.client.api.users['@me'].guilds[this.id].delete()
    .then(() => this.client.actions.GuildDelete.handle({ id: this.id }).guild);
  }

@@ -1011,7 +1011,7 @@ class Guild {
   *  .catch(console.error);
   */
  delete() {
-    return this.client.api.guilds(this.id).delete()
+    return this.client.api.guilds[this.id].delete()
    .then(() => this.client.actions.GuildDelete.handle({ id: this.id }).guild);
  }

@@ -1169,7 +1169,7 @@ class Guild {
    Util.moveElementInArray(updatedRoles, role, position, relative);

    updatedRoles = updatedRoles.map((r, i) => ({ id: r.id, position: i }));
-    return this.client.api.guilds(this.id).roles.patch({ data: updatedRoles })
+    return this.client.api.guilds[this.id].roles.patch({ data: updatedRoles })
    .then(() =>
      this.client.actions.GuildRolesPositionUpdate.handle({
        guild_id: this.id,
@@ -1199,7 +1199,7 @@ class Guild {
    Util.moveElementInArray(updatedChannels, channel, position, relative);

    updatedChannels = updatedChannels.map((r, i) => ({ id: r.id, position: i }));
-    return this.client.api.guilds(this.id).channels.patch({ data: updatedChannels })
+    return this.client.api.guilds[this.id].channels.patch({ data: updatedChannels })
    .then(() =>
      this.client.actions.GuildChannelsPositionUpdate.handle({
        guild_id: this.id,
--- a/src/structures/GuildChannel.js
+++ b/src/structures/GuildChannel.js
@@ -188,7 +188,7 @@ class GuildChannel extends Channel {
      }
    }

-    return this.client.api.channels(this.id).permissions(payload.id)
+    return this.client.api.channels[this.id].permissions(payload.id)
      .put({ data: payload, reason })
      .then(() => this);
  }
@@ -215,7 +215,7 @@ class GuildChannel extends Channel {
   *  .catch(console.error);
   */
  edit(data, reason) {
-    return this.client.api.channels(this.id).patch({
+    return this.client.api.channels[this.id].patch({
      data: {
        name: (data.name || this.name).trim(),
        topic: data.topic || this.topic,
@@ -287,7 +287,7 @@ class GuildChannel extends Channel {
   * @returns {Promise<Invite>}
   */
  createInvite({ temporary = false, maxAge = 86400, maxUses = 0, reason } = {}) {
-    return this.client.api.channels(this.id).invites.post({ data: {
+    return this.client.api.channels[this.id].invites.post({ data: {
      temporary, max_age: maxAge, max_uses: maxUses,
    }, reason })
      .then(invite => new Invite(this.client, invite));
@@ -351,7 +351,7 @@ class GuildChannel extends Channel {
   *  .catch(console.error); // Log error
   */
  delete(reason) {
-    return this.client.api.channels(this.id).delete({ reason }).then(() => this);
+    return this.client.api.channels[this.id].delete({ reason }).then(() => this);
  }

  /**
--- a/src/structures/GuildMember.js
+++ b/src/structures/GuildMember.js
@@ -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);
  }
@@ -398,7 +398,7 @@ class GuildMember {
    if (!(role instanceof Role)) role = this.guild.roles.get(role);
    if (!role) return Promise.reject(new TypeError('Supplied parameter was neither a 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()
      .then(() => this);
  }
@@ -427,7 +427,7 @@ class GuildMember {
  removeRole(role) {
    if (!(role instanceof Role)) role = this.guild.roles.get(role);
    if (!role) return Promise.reject(new TypeError('Supplied parameter was neither a 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()
      .then(() => this);
  }
@@ -484,7 +484,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,
--- a/src/structures/Invite.js
+++ b/src/structures/Invite.js
@@ -145,7 +145,7 @@ class Invite {
   * @returns {Promise<Invite>}
   */
  delete(reason) {
-    return this.client.api.invites(this.code).delete({ reason }).then(() => this);
+    return this.client.api.invites[this.code].delete({ reason }).then(() => this);
  }

  /**
--- a/src/structures/Message.js
+++ b/src/structures/Message.js
@@ -399,7 +399,7 @@ class Message {
      content = `${mention}${content ? `, ${content}` : ''}`;
    }

-    return this.client.api.channels(this.channel.id).messages(this.id)
+    return this.client.api.channels[this.channel.id].messages[this.id]
      .patch({ data: { content, embed } })
      .then(data => this.client.actions.MessageUpdate.handle(data).updated);
  }
@@ -409,7 +409,7 @@ class Message {
   * @returns {Promise<Message>}
   */
  pin() {
-    return this.client.api.channels(this.channel.id).pins(this.id).put()
+    return this.client.api.channels[this.channel.id].pins[this.id].put()
      .then(() => this);
  }

@@ -418,7 +418,7 @@ class Message {
   * @returns {Promise<Message>}
   */
  unpin() {
-    return this.client.api.channels(this.channel.id).pins(this.id).delete()
+    return this.client.api.channels[this.channel.id].pins[this.id].delete()
      .then(() => this);
  }

@@ -431,7 +431,7 @@ class Message {
    emoji = this.client.resolver.resolveEmojiIdentifier(emoji);
    if (!emoji) throw new TypeError('EMOJI_TYPE');

-    return this.client.api.channels(this.channel.id).messages(this.id).reactions(emoji)['@me']
+    return this.client.api.channels[this.channel.id].messages[this.id].reactions[emoji]['@me']
      .put()
      .then(() => this._addReaction(Util.parseEmoji(emoji), this.client.user));
  }
@@ -441,7 +441,7 @@ class Message {
   * @returns {Promise<Message>}
   */
  clearReactions() {
-    return this.client.api.channels(this.channel.id).messages(this.id).reactions.delete()
+    return this.client.api.channels[this.channel.id].messages[this.id].reactions.delete()
      .then(() => this);
  }

@@ -459,7 +459,7 @@ class Message {
   */
  delete({ timeout = 0, reason } = {}) {
    if (timeout <= 0) {
-      return this.client.api.channels(this.channel.id).messages(this.id)
+      return this.client.api.channels[this.channel.id].messages[this.id]
        .delete({ reason })
        .then(() =>
          this.client.actions.MessageDelete.handle({
@@ -502,7 +502,7 @@ class Message {
   * @returns {Promise<Message>}
   */
  acknowledge() {
-    return this.client.api.channels(this.channel.id).messages(this.id).ack
+    return this.client.api.channels[this.channel.id].messages[this.id].ack
      .post({ data: { token: this.client.rest._ackToken } })
      .then(res => {
        if (res.token) this.client.rest._ackToken = res.token;
--- a/src/structures/MessageReaction.js
+++ b/src/structures/MessageReaction.js
@@ -63,8 +63,8 @@ class MessageReaction {
  remove(user = this.message.client.user) {
    const userID = this.message.client.resolver.resolveUserID(user);
    if (!userID) return Promise.reject(new Error('Couldn\'t resolve the user ID to remove from the reaction.'));
-    return this.message.client.api.channels(this.message.channel.id).messages(this.message.id)
-      .reactions(this.emoji.identifier)[userID === this.message.client.user.id ? '@me' : userID]
+    return this.message.client.api.channels[this.message.channel.id].messages[this.message.id]
+      .reactions[this.emoji.identifier][userID === this.message.client.user.id ? '@me' : userID]
      .delete()
      .then(() =>
        this.message.client.actions.MessageReactionRemove.handle({
@@ -83,8 +83,8 @@ class MessageReaction {
   */
  fetchUsers(limit = 100) {
    const message = this.message;
-    return message.client.api.channels(message.channel.id).messages(message.id)
-      .reactions(this.emoji.identifier)
+    return message.client.api.channels[message.channel.id].messages[message.id]
+      .reactions[this.emoji.identifier]
      .get({ query: { limit } })
      .then(users => {
        this.users = new Collection();
--- a/src/structures/PermissionOverwrites.js
+++ b/src/structures/PermissionOverwrites.js
@@ -51,7 +51,7 @@ class PermissionOverwrites {
   * @returns {Promise<PermissionOverwrites>}
   */
  delete(reason) {
-    return this.channel.client.api.channels(this.channel.id).permissions(this.id)
+    return this.channel.client.api.channels[this.channel.id].permissions[this.id]
      .delete({ reason })
      .then(() => this);
  }
--- a/src/structures/Role.js
+++ b/src/structures/Role.js
@@ -202,7 +202,7 @@ class Role {
  edit(data, reason) {
    if (data.permissions) data.permissions = Permissions.resolve(data.permissions);
    else data.permissions = this.permissions;
-    return this.client.api.guilds(this.guild.id).roles(this.id).patch({
+    return this.client.api.guilds[this.guild.id].roles[this.id].patch({
      data: {
        name: data.name || this.name,
        position: typeof data.position !== 'undefined' ? data.position : this.position,
@@ -311,7 +311,7 @@ class Role {
   *  .catch(console.error);
   */
  delete(reason) {
-    return this.client.api.guilds(this.guild.id).roles(this.id).delete({ reason })
+    return this.client.api.guilds[this.guild.id].roles[this.id].delete({ reason })
    .then(() =>
      this.client.actions.GuildRoleDelete.handle({ guild_id: this.guild.id, role_id: this.id }).role
    );
--- a/src/structures/TextChannel.js
+++ b/src/structures/TextChannel.js
@@ -57,7 +57,7 @@ class TextChannel extends GuildChannel {
   * @returns {Promise<Collection<Snowflake, Webhook>>}
   */
  fetchWebhooks() {
-    return this.client.api.channels(this.id).webhooks.get().then(data => {
+    return this.client.api.channels[this.id].webhooks.get().then(data => {
      const hooks = new Collection();
      for (const hook of data) hooks.set(hook.id, new Webhook(this.client, hook));
      return hooks;
@@ -76,7 +76,7 @@ class TextChannel extends GuildChannel {
   */
  createWebhook(name, avatar) {
    if (typeof avatar === 'string' && avatar.startsWith('data:')) {
-      return this.client.api.channels(this.id).webhooks.post({ data: {
+      return this.client.api.channels[this.id].webhooks.post({ data: {
        name, avatar,
      } }).then(data => new Webhook(this.client, data));
    } else {
--- a/src/structures/User.js
+++ b/src/structures/User.js
@@ -205,7 +205,7 @@ class User {
   */
  createDM() {
    if (this.dmChannel) return Promise.resolve(this.dmChannel);
-    return this.client.api.users(this.client.user.id).channels.post({ data: {
+    return this.client.api.users[this.client.user.id].channels.post({ data: {
      recipient_id: this.id,
    } })
    .then(data => this.client.actions.ChannelCreate.handle(data).channel);
@@ -217,7 +217,7 @@ class User {
   */
  deleteDM() {
    if (!this.dmChannel) return Promise.reject(new Error('No DM Channel exists!'));
-    return this.client.api.channels(this.dmChannel.id).delete().then(data =>
+    return this.client.api.channels[this.dmChannel.id].delete().then(data =>
       this.client.actions.ChannelDelete.handle(data).channel
    );
  }
@@ -228,7 +228,7 @@ class User {
   * @returns {Promise<UserProfile>}
   */
  fetchProfile() {
-    return this.client.api.users(this.id).profile.get().then(data => new UserProfile(data));
+    return this.client.api.users[this.id].profile.get().then(data => new UserProfile(data));
  }

  /**
@@ -238,7 +238,7 @@ class User {
   * @returns {Promise<User>}
   */
  setNote(note) {
-    return this.client.api.users('@me').notes(this.id).put({ data: { note } })
+    return this.client.api.users['@me'].notes[this.id].put({ data: { note } })
      .then(() => this);
  }

--- a/src/structures/Webhook.js
+++ b/src/structures/Webhook.js
@@ -150,7 +150,7 @@ class Webhook {
          file.file = buffer;
          return file;
        })
-      )).then(files => this.client.api.webhooks(this.id, this.token).post({
+      )).then(files => this.client.api.webhooks.opts(this.id, this.token).post({
        data: options,
        query: { wait: true },
        files,
@@ -158,7 +158,7 @@ class Webhook {
      }));
    }

-    return this.client.api.webhooks(this.id, this.token).post({
+    return this.client.api.webhooks.opts(this.id, this.token).post({
      data: options,
      query: { wait: true },
      auth: false,
@@ -187,7 +187,7 @@ class Webhook {
   * }).catch(console.error);
   */
  sendSlackMessage(body) {
-    return this.client.api.webhooks(this.id, this.token).slack.post({
+    return this.client.api.webhooks.opts(this.id, this.token).slack.post({
      query: { wait: true },
      auth: false,
      data: body,
@@ -213,7 +213,7 @@ class Webhook {
        return this.edit({ name, avatar: dataURI }, reason);
      });
    }
-    return this.client.api.webhooks(this.id, this.token).patch({
+    return this.client.api.webhooks.opts(this.id, this.token).patch({
      data: { name, avatar },
      reason,
    }).then(data => {
@@ -229,7 +229,7 @@ class Webhook {
   * @returns {Promise}
   */
  delete(reason) {
-    return this.client.api.webhooks(this.id, this.token).delete({ reason });
+    return this.client.api.webhooks.opts(this.id, this.token).delete({ reason });
  }
 }

--- a/src/structures/interfaces/TextBasedChannel.js
+++ b/src/structures/interfaces/TextBasedChannel.js
@@ -141,7 +141,7 @@ class TextBasedChannel {
        return msg;
      });
    }
-    return this.client.api.channels(this.id).messages(messageID).get()
+    return this.client.api.channels[this.id].messages[messageID].get()
    .then(data => {
      const msg = data instanceof Message ? data : new Message(this, data, this.client);
      this._cacheMessage(msg);
@@ -171,7 +171,7 @@ class TextBasedChannel {
   */
  fetchMessages(options = {}) {
    const Message = require('../Message');
-    return this.client.api.channels(this.id).messages.get({ query: options })
+    return this.client.api.channels[this.id].messages.get({ query: options })
    .then(data => {
      const messages = new Collection();
      for (const message of data) {
@@ -189,7 +189,7 @@ class TextBasedChannel {
   */
  fetchPinnedMessages() {
    const Message = require('../Message');
-    return this.client.api.channels(this.id).pins.get().then(data => {
+    return this.client.api.channels[this.id].pins.get().then(data => {
      const messages = new Collection();
      for (const message of data) {
        const msg = new Message(this, message, this.client);
@@ -230,7 +230,7 @@ class TextBasedChannel {
  startTyping(count) {
    if (typeof count !== 'undefined' && count < 1) throw new RangeError('TYPING_COUNT');
    if (!this.client.user._typing.has(this.id)) {
-      const endpoint = this.client.api.channels(this.id).typing;
+      const endpoint = this.client.api.channels[this.id].typing;
      this.client.user._typing.set(this.id, {
        count: count || 1,
        interval: this.client.setInterval(() => {
@@ -353,7 +353,7 @@ class TextBasedChannel {
          Date.now() - Snowflake.deconstruct(id).date.getTime() < 1209600000
        );
      }
-      return this.client.api.channels(this.id).messages()['bulk-delete']
+      return this.client.api.channels[this.id].messages['bulk-delete']
      .post({ data: { messages: messageIDs } })
      .then(() =>
        this.client.actions.MessageDeleteBulk.handle({
@@ -372,7 +372,7 @@ class TextBasedChannel {
   */
  acknowledge() {
    if (!this.lastMessageID) return Promise.resolve(this);
-    return this.client.api.channels(this.id).messages(this.lastMessageID).ack
+    return this.client.api.channels[this.id].messages[this.lastMessageID].ack
      .post({ data: { token: this.client.rest._ackToken } })
      .then(res => {
        if (res.token) this.client.rest._ackToken = res.token;
--- a/src/structures/shared/SendMessage.js
+++ b/src/structures/shared/SendMessage.js
@@ -55,7 +55,7 @@ module.exports = function sendMessage(channel, options) {
    });
  }

-  return channel.client.api.channels(channel.id).messages.post({
+  return channel.client.api.channels[channel.id].messages.post({
    data: { content, tts, nonce, embed },
    files,
  }).then(data => channel.client.actions.MessageCreate.handle(data).message);