From 4a7284b86e551ec95b2eec17993ef7e35702312f Mon Sep 17 00:00:00 2001 From: ooookai Date: Sun, 8 Jan 2017 13:34:06 -0600 Subject: [PATCH] move function getRoute(url) into class APIRequest (#1065) this.route = getRoute(this.url); >>> this.route = this.getRoute(this.url); --- src/client/rest/APIRequest.js | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/client/rest/APIRequest.js b/src/client/rest/APIRequest.js index 36c2d8fed..5e83c143b 100644 --- a/src/client/rest/APIRequest.js +++ b/src/client/rest/APIRequest.js @@ -1,16 +1,6 @@ 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.includes('/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; @@ -19,7 +9,17 @@ class APIRequest { this.auth = auth; this.data = data; this.file = file; - this.route = getRoute(this.url); + this.route = this.getRoute(this.url); + } + + getRoute(url) { + let route = url.split('?')[0]; + if (route.includes('/channels/') || route.includes('/guilds/')) { + const startInd = route.includes('/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; } getAuth() {