From 4f1a560f3c85474cf411267c240ed420bdb1c770 Mon Sep 17 00:00:00 2001 From: Carter <45381083+Fyk0@users.noreply.github.com> Date: Tue, 7 May 2019 20:46:11 -0700 Subject: [PATCH 1/4] added DARK_MODE_INVISIBLE added another constant color that makes embeds appear invisible on DARK mode. --- src/util/Constants.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/util/Constants.js b/src/util/Constants.js index 0d8f3b6e3dc1..c83a18bac844 100644 --- a/src/util/Constants.js +++ b/src/util/Constants.js @@ -450,6 +450,7 @@ exports.Colors = { GREYPLE: 0x99AAB5, DARK_BUT_NOT_BLACK: 0x2C2F33, NOT_QUITE_BLACK: 0x23272A, + DARK_MODE_INVISIBLE: 0x36393F }; /** From 0f932544a002cfbf5d5cd608e9b61f3308f2ab0f Mon Sep 17 00:00:00 2001 From: Carter <45381083+Fyk0@users.noreply.github.com> Date: Tue, 7 May 2019 20:53:35 -0700 Subject: [PATCH 2/4] travis likes trailing commas --- src/util/Constants.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/Constants.js b/src/util/Constants.js index c83a18bac844..7b05703f5d46 100644 --- a/src/util/Constants.js +++ b/src/util/Constants.js @@ -450,7 +450,7 @@ exports.Colors = { GREYPLE: 0x99AAB5, DARK_BUT_NOT_BLACK: 0x2C2F33, NOT_QUITE_BLACK: 0x23272A, - DARK_MODE_INVISIBLE: 0x36393F + DARK_MODE_INVISIBLE: 0x36393F, }; /** From d11c75ee5f0ff3e089bd49fe4bab4787b051eba7 Mon Sep 17 00:00:00 2001 From: Carter Himmel Date: Fri, 2 Aug 2019 11:03:54 -0600 Subject: [PATCH 3/4] fix: ref issue: #3414 --- src/stores/GuildMemberStore.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/stores/GuildMemberStore.js b/src/stores/GuildMemberStore.js index 9f9c42117e7e..fe6aaad522a8 100644 --- a/src/stores/GuildMemberStore.js +++ b/src/stores/GuildMemberStore.js @@ -192,8 +192,8 @@ class GuildMemberStore extends DataStore { _fetchMany({ query = '', limit = 0 } = {}) { return new Promise((resolve, reject) => { - if (this.guild.memberCount === this.size) { - resolve(query || limit ? new Collection() : this); + if (this.guild.memberCount === this.size && !query && !limit) { + resolve(this); return; } this.guild.shard.send({ From b5ed572e69389a170a214adb51f58e17b12b259a Mon Sep 17 00:00:00 2001 From: Carter Himmel Date: Fri, 2 Aug 2019 11:07:22 -0600 Subject: [PATCH 4/4] fix: removed a random color --- src/util/Constants.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/util/Constants.js b/src/util/Constants.js index db97bdfd6471..1286e18c2eff 100644 --- a/src/util/Constants.js +++ b/src/util/Constants.js @@ -461,7 +461,6 @@ exports.Colors = { GREYPLE: 0x99AAB5, DARK_BUT_NOT_BLACK: 0x2C2F33, NOT_QUITE_BLACK: 0x23272A, - DARK_MODE_INVISIBLE: 0x36393F, }; /**