From c07207f219268010ace0dc6c35b518e990b2865b Mon Sep 17 00:00:00 2001
From: That_Guy977 <72870724+That-Guy977@users.noreply.github.com>
Date: Wed, 1 Dec 2021 18:32:13 +0700
Subject: [PATCH] fix(Util): fix sorting for GuildChannels (#7002)

---
 src/util/Util.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/util/Util.js b/src/util/Util.js
index b40f8e40deef..a9ea8f731ce4 100644
--- 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');