Made (hopefully) all url related methods accept an options objects (#1617)

and removed a leftover in User#avatarURL
This commit is contained in:
SpaceEEC
2017-07-04 00:08:24 +02:00
committed by Crawl
parent ee3a2415e4
commit 3fa880df5b
3 changed files with 14 additions and 22 deletions

View File

@@ -261,16 +261,13 @@ class Guild {
/** /**
* Gets the URL to this guild's icon * Gets the URL to this guild's icon
* @param {string} [format='webp'] One of `webp`, `png`, `jpg`, `gif` * @param {Object} [options={}] Options for the icon url
* @param {number} [size=128] One of `128`, '256', `512`, `1024`, `2048` * @param {string} [options.format='webp'] One of `webp`, `png`, `jpg`
* @param {number} [options.size=128] One of `128`, '256', `512`, `1024`, `2048`
* @returns {?string} * @returns {?string}
*/ */
iconURL(format, size) { iconURL({ format, size } = {}) {
if (!this.icon) return null; if (!this.icon) return null;
if (typeof format === 'number') {
size = format;
format = 'default';
}
return Constants.Endpoints.CDN(this.client.options.http.cdn).Icon(this.id, this.icon, format, size); return Constants.Endpoints.CDN(this.client.options.http.cdn).Icon(this.id, this.icon, format, size);
} }
@@ -285,12 +282,14 @@ class Guild {
/** /**
* The URL to this guild's splash * The URL to this guild's splash
* @type {?string} * @param {Object} [options={}] Options for the splash url
* @readonly * @param {string} [options.format='webp'] One of `webp`, `png`, `jpg`
* @param {number} [options.size=128] One of `128`, '256', `512`, `1024`, `2048`
* @returns {?string}
*/ */
get splashURL() { splashURL({ format, size } = {}) {
if (!this.splash) return null; if (!this.splash) return null;
return Constants.Endpoints.CDN(this.client.options.http.cdn).Splash(this.id, this.splash); return Constants.Endpoints.CDN(this.client.options.http.cdn).Splash(this.id, this.splash, format, size);
} }
/** /**

View File

@@ -119,16 +119,13 @@ class OAuth2Application {
/** /**
* A link to the application's icon * A link to the application's icon
* @param {string} [format='webp'] One of `webp`, `png`, `jpg`, `gif`. * @param {Object} [options={}] Options for the icon url
* @param {number} [size=128] One of `128`, '256', `512`, `1024`, `2048` * @param {string} [options.format='webp'] One of `webp`, `png`, `jpg`
* @param {number} [options.size=128] One of `128`, '256', `512`, `1024`, `2048`
* @returns {?string} URL to the icon * @returns {?string} URL to the icon
*/ */
iconURL(format, size) { iconURL({ format, size } = {}) {
if (!this.icon) return null; if (!this.icon) return null;
if (typeof format === 'number') {
size = format;
format = 'default';
}
return Constants.Endpoints.CDN(this.client.options.http.cdn).AppIcon(this.id, this.icon, format, size); return Constants.Endpoints.CDN(this.client.options.http.cdn).AppIcon(this.id, this.icon, format, size);
} }

View File

@@ -113,10 +113,6 @@ class User {
*/ */
avatarURL({ format, size } = {}) { avatarURL({ format, size } = {}) {
if (!this.avatar) return null; if (!this.avatar) return null;
if (typeof format === 'number') {
size = format;
format = 'default';
}
return Constants.Endpoints.CDN(this.client.options.http.cdn).Avatar(this.id, this.avatar, format, size); return Constants.Endpoints.CDN(this.client.options.http.cdn).Avatar(this.id, this.avatar, format, size);
} }