comply to the latest rate limit stuff (discord/discord-api-docs#108)

discordjs · Sep 24, 2016 · aef0b83 · aef0b83
1 parent bd1449b
commit aef0b83
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/docs/docs.json b/docs/docs.json
diff --git a/src/client/rest/APIRequest.js b/src/client/rest/APIRequest.js
@@ -1,6 +1,16 @@
 const request = require('superagent');
 const Constants = require('../../util/Constants');
 
+function getRoute(url) {
+  let route = url.split('?')[0];
+  if (route.includes('/channels/') || route.includes('/guilds/')) {
+    const startInd = ~route.indexOf('/channels/') ? route.indexOf('/channels/') : route.indexOf('/guilds/');
+    const majorID = route.substring(startInd).split('/')[2];
+    route = route.replace(/(\d{8,})/g, ':id').replace(':id', majorID);
+  }
+  return route;
+}
+
 class APIRequest {
   constructor(rest, method, url, auth, data, file) {
     this.rest = rest;
@@ -9,10 +19,7 @@ class APIRequest {
     this.auth = auth;
     this.data = data;
     this.file = file;
-  }
-
-  getEndpoint() {
-    return this.url;
+    this.route = getRoute(this.url);
   }
 
   getAuth() {

diff --git a/src/client/rest/RESTManager.js b/src/client/rest/RESTManager.js
@@ -39,12 +39,12 @@ class RESTManager {
   makeRequest(method, url, auth, data, file) {
     const apiRequest = new APIRequest(this, method, url, auth, data, file);
 
-    if (!this.handlers[apiRequest.getEndpoint()]) {
+    if (!this.handlers[apiRequest.route]) {
       const RequestHandlerType = this.getRequestHandler();
-      this.handlers[apiRequest.getEndpoint()] = new RequestHandlerType(this, apiRequest.getEndpoint());
+      this.handlers[apiRequest.route] = new RequestHandlerType(this, apiRequest.route);
     }
 
-    return this.push(this.handlers[apiRequest.getEndpoint()], apiRequest);
+    return this.push(this.handlers[apiRequest.route], apiRequest);
   }
 }