Fix ordering for DMs without last_message_id

Also removed force unwrap in sorting function

Author: cryptoAlgorithm

Swiftcord.xcodeproj/project.pbxproj

@@ -830,7 +830,7 @@
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/SwiftcordApp/DiscordKit";
 			requirement = {
-				branch = main;
+				branch = "dm-ordering";
 				kind = branch;
 			};
 		};

Swiftcord.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -11,15 +11,13 @@ extension Array where Element == Channel {
 	func discordSorted() -> Self {
 		sorted { c1, c2 in
 			// This is a DM/Group DM channel
-			if c1.type == .dm || c1.type == .groupDM,
-			   let c1m = c1.last_message_id,
-			   let c2m = c2.last_message_id  {
-				return c1m > c2m
-			}
+			if c1.type == .dm || c1.type == .groupDM {
+				return c1.last_message_id ?? c1.id > c2.last_message_id ?? c2.id
+		    }
 
 			if c1.type == .voice, c2.type != .voice { return false }
 			if c1.type != .voice, c2.type == .voice { return true }
-			if c1.position != nil, c2.position != nil { return c2.position! > c1.position! }
+			if let p1 = c1.position, let p2 = c2.position { return p2 > p1 }
 			return c2.id > c1.id
 		}
 	}

Swiftcord/Utils/Extensions/DiscordAPI/Array.Channel+.swift

@@ -78,7 +78,7 @@ struct LoadingView: View {
         .frame(maxWidth: .infinity, maxHeight: .infinity)
         .allowsHitTesting(loadingNum != loadingStrings.count - 1)
         .background(Color(NSColor.windowBackgroundColor))
-		.opacity(loadingNum != loadingStrings.count - 1 ? 0.2 : 0)
+		.opacity(loadingNum != loadingStrings.count - 1 ? 1 : 0)
         .scaleEffect(loadingNum != loadingStrings.count - 1 ? 1 : 2)
         .animation(.interpolatingSpring(stiffness: 200, damping: 120), value: loadingNum != loadingStrings.count - 1)
     }

Swiftcord/Views/LoadingView.swift

@@ -78,7 +78,7 @@ struct DMButton: View {
 				VStack(alignment: .leading, spacing: 2) {
 					Text(dm.label(gateway.cache.users) ?? "nil")
 					if dm.type == .groupDM {
-						Text("\(dm.recipient_ids?.count ?? 2) Members").font(.caption)
+						Text("\((dm.recipient_ids?.count ?? 2) + 1) Members").font(.caption)
 					}
 				}
 				Spacer()

Swiftcord/Views/Server/ChannelButton.swift

@@ -32,13 +32,16 @@ struct UserAvatarView: View {
             guard !clickDisabled else { return }
             // Get user profile for a fuller User object
             if profile == nil && webhookID == nil { Task {
-                profile = await DiscordAPI.getProfile(user: user.id, guildID: guildID)
+                profile = await DiscordAPI.getProfile(
+					user: user.id,
+					guildID: guildID == "@me" ? nil : guildID
+				)
                 guard profile != nil else { // Profile is still nil: fetching failed
                     loadFullFailed = true
                     return
                 }
             }}
-            if guildRoles == nil && webhookID == nil { Task {
+            if guildRoles == nil, webhookID == nil, guildID != "@me" { Task {
                 guildRoles = await DiscordAPI.getGuildRoles(id: guildID)
                 // print(guildRoles)
             }}
@@ -130,39 +133,37 @@ struct UserAvatarView: View {
                             Text("NO ABOUT").font(.headline)
                         }
 
-                        if let profile = profile {
-                            if let guildRoles = guildRoles {
-                                let roles = guildRoles.filter({ r in
-                                    profile.guild_member!.roles.contains(r.id)
-                                })
-                                
-                                Text(roles.isEmpty
-                                     ? "NO ROLES"
-                                     : (roles.count == 1 ? "ROLE" : "ROLES")
-                                ).font(.headline).padding(.top, 8)
-                                if !roles.isEmpty {
-                                    TagCloudView(content: roles.map({ role in
-										HStack(spacing: 6) {
-											Circle()
-												.fill(Color(hex: role.color))
-												.frame(width: 14, height: 14)
-												.padding(.leading, 6)
-											Text(role.name)
-												.font(.system(size: 12))
-												.padding(.trailing, 8)
-										}
-										.frame(height: 24)
-										.background(Color.gray.opacity(0.2))
-										.cornerRadius(7)
-                                    })).padding(-2)
-                                }
-							} else {
-								ProgressView("Loading roles...")
-									.progressViewStyle(.linear)
-									.frame(maxWidth: .infinity)
-									.tint(.blue)
+						if let profile = profile, let guildRoles = guildRoles {
+							let roles = guildRoles.filter({ r in
+								profile.guild_member!.roles.contains(r.id)
+							})
+							
+							Text(roles.isEmpty
+								 ? "NO ROLES"
+								 : (roles.count == 1 ? "ROLE" : "ROLES")
+							).font(.headline).padding(.top, 8)
+							if !roles.isEmpty {
+								TagCloudView(content: roles.map({ role in
+									HStack(spacing: 6) {
+										Circle()
+											.fill(Color(hex: role.color))
+											.frame(width: 14, height: 14)
+											.padding(.leading, 6)
+										Text(role.name)
+											.font(.system(size: 12))
+											.padding(.trailing, 8)
+									}
+									.frame(height: 24)
+									.background(Color.gray.opacity(0.2))
+									.cornerRadius(7)
+								})).padding(-2)
 							}
-                        }
+						} else {
+							ProgressView("Loading roles...")
+								.progressViewStyle(.linear)
+								.frame(maxWidth: .infinity)
+								.tint(.blue)
+						}
 
                         Text("NOTE").font(.headline).padding(.top, 8)
                         // Notes are stored locally for now, but eventually will be synced with the Discord API