fix(Util): fix sorting for GuildChannels (#7002)

discordjs · Dec 1, 2021 · c07207f · c07207f
1 parent 4fe063f
commit c07207f
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/src/util/Util.js b/src/util/Util.js
@@ -483,11 +483,11 @@ class Util extends null {
    * @returns {Collection}
    */
   static discordSort(collection) {
+    const isGuildChannel = collection.first() instanceof GuildChannel;
     return collection.sorted(
-      (a, b) =>
-        a.rawPosition - b.rawPosition ||
-        parseInt(b.id.slice(0, -10)) - parseInt(a.id.slice(0, -10)) ||
-        parseInt(b.id.slice(10)) - parseInt(a.id.slice(10)),
+      isGuildChannel
+        ? (a, b) => a.rawPosition - b.rawPosition || Number(BigInt(a.id) - BigInt(b.id))
+        : (a, b) => a.rawPosition - b.rawPosition || Number(BigInt(b.id) - BigInt(a.id)),
     );
   }
 
@@ -616,3 +616,6 @@ class Util extends null {
 }
 
 module.exports = Util;
+
+// Fixes Circular
+const GuildChannel = require('../structures/GuildChannel');