From 50174ef0d25034dd601a5b2060e6f6692a800b05 Mon Sep 17 00:00:00 2001
From: Dan Dryaev <48590492+ShadiestGoat@users.noreply.github.com>
Date: Tue, 1 Nov 2022 19:09:15 +0000
Subject: [PATCH] Use channel ID to sort private channels by default (#243)

Co-authored-by: ayntgl <90600421+ayntgl@users.noreply.github.com>
---
 ui/channels_view.go | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/ui/channels_view.go b/ui/channels_view.go
index 7811010..c554f67 100644
--- a/ui/channels_view.go
+++ b/ui/channels_view.go
@@ -86,7 +86,15 @@ func (v *ChannelsView) createPrivateChannelNodes(root *tview.TreeNode) {
 	}
 
 	sort.Slice(cs, func(i, j int) bool {
-		return cs[i].LastMessageID > cs[j].LastMessageID
+		idUsed := discord.MessageID(cs[i].ID)
+		idUsed2 := discord.MessageID(cs[j].ID)
+		if cs[i].LastMessageID.IsValid() {
+			idUsed = cs[i].LastMessageID
+		}
+		if cs[j].LastMessageID.IsValid() {
+			idUsed2 = cs[j].LastMessageID
+		}
+		return idUsed > idUsed2
 	})
 
 	for _, c := range cs {