Remove ImageSizes array and fix minimum image size

Checking for 2^n and a bounds check is cleaner than hand-writing all the possible sizes Also changed the image size range to 16-1024. Thanks to @Alpacatty for pointing this out
abalabahaha · Mar 30, 2018 · af2619c · af2619c
1 parent 09e420c
commit af2619c
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 16 deletions.
diff --git a/index.d.ts b/index.d.ts
@@ -200,7 +200,6 @@ declare module "eris" {
   interface Constants {
     DefaultAvatarHashes: string[];
     ImageFormats: string[];
-    ImageSizes: number[];
     GatewayOPCodes: {[key: string]: number};
     GATEWAY_VERSION: number;
     Permissions: {[key: string]: number};

diff --git a/lib/Client.js b/lib/Client.js
@@ -121,10 +121,11 @@ class Client extends EventEmitter {
             this.options.compress = false; // zlib does not like Blobs, Pako is not here
         }
         if(!~Constants.ImageFormats.indexOf(this.options.defaultImageFormat.toLowerCase())) {
-            this.options.defaultImageFormat = "jpg";
+            throw new TypeError("Invalid default image format: " + this.options.defaultImageFormat);
         }
-        if(!~Constants.ImageSizes.indexOf(this.options.defaultImageSize)) {
-            this.options.defaultImageSize = 128;
+        var defaultImageSize = this.options.defaultImageSize;
+        if(defaultImageSize < 16 || defaultImageSize > 1024 || (defaultImageSize & (defaultImageSize - 1))) {
+            throw new TypeError("Invalid default image size: " + defaultImageSize);
         }
 
         this.token = token;

diff --git a/lib/Constants.js b/lib/Constants.js
@@ -15,14 +15,6 @@ module.exports.ImageFormats = [
     "gif"
 ];
 
-module.exports.ImageSizes = [
-    128,
-    256,
-    512,
-    1024,
-    2048
-];
-
 module.exports.GatewayOPCodes = {
     EVENT:              0,
     HEARTBEAT:          1,

diff --git a/lib/structures/GroupChannel.js b/lib/structures/GroupChannel.js
@@ -78,7 +78,7 @@ class GroupChannel extends PrivateChannel { // (╯°□°）╯︵ ┻━┻
         if(!format || !~Constants.ImageFormats.indexOf(format.toLowerCase())) {
             format = this._client.options.defaultImageFormat;
         }
-        if(!size || !~Constants.ImageSizes.indexOf(size)) {
+        if(size < 16 || size > 1024 || (size & (size - 1))) {
              size = this._client.options.defaultImageSize;
         }
         return this.icon ? `${Endpoints.CDN_URL}/channel-icons/${this.id}/${this.icon}.${format}?size=${size}` : null;

diff --git a/lib/structures/Guild.js b/lib/structures/Guild.js
@@ -160,7 +160,7 @@ class Guild extends Base {
         if(!format || !~Constants.ImageFormats.indexOf(format.toLowerCase())) {
             format = this.shard.client.options.defaultImageFormat;
         }
-        if(!size || !~Constants.ImageSizes.indexOf(size)) {
+        if(size < 16 || size > 1024 || (size & (size - 1))) {
              size = this.shard.client.options.defaultImageSize;
         }
         return this.icon ? `${CDN_URL}/icons/${this.id}/${this.icon}.${format}?size=${size}` : null;

diff --git a/lib/structures/User.js b/lib/structures/User.js
@@ -71,11 +71,11 @@ class User extends Base {
         if (!this.avatar) {
             return this.defaultAvatarURL;
         }
-        
+
         if(!format || !~Constants.ImageFormats.indexOf(format.toLowerCase())) {
             format = this.avatar.startsWith("a_") ? "gif" : this._client.options.defaultImageFormat;
         }
-        if(!size || !~Constants.ImageSizes.indexOf(size)) {
+        if(size < 16 || size > 1024 || (size & (size - 1))) {
             size = this._client.options.defaultImageSize;
         }
         return `${CDN_URL}/avatars/${this.id}/${this.avatar}.${format}?size=${size}`;