fix(user): update most uses of username to match Discord username update

fix(currentUser): show username instead of discrim if account is migrated, in user footer
funsiyuan · Oct 5, 2023 · 71cf78d · 71cf78d
1 parent 87aae42
commit 71cf78d
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 7 deletions.
diff --git a/Swiftcord/Utils/Extensions/DiscordAPI/Channel+.swift b/Swiftcord/Utils/Extensions/DiscordAPI/Channel+.swift
@@ -10,7 +10,7 @@ import DiscordKitCore
 extension Channel {
 	func label(_ users: [Snowflake: User] = [:]) -> String? {
 		name ?? recipient_ids?
-			.compactMap { users[$0]?.username }
+			.compactMap { users[$0]?.displayName }
 			.joined(separator: ", ")
 	}
 }

diff --git a/Swiftcord/Utils/Extensions/DiscordAPI/User+displayName.swift b/Swiftcord/Utils/Extensions/DiscordAPI/User+displayName.swift
@@ -0,0 +1,15 @@
+//
+//  User+displayName.swift
+//  Swiftcord
+//
+//  Created by Vincent Kwok on 5/10/23.
+//
+
+import Foundation
+import DiscordKitCore
+
+extension User {
+	var displayName: String {
+		global_name ?? username
+	}
+}
diff --git a/Swiftcord/Views/Message/MessageRenderViews/MessageView.swift b/Swiftcord/Views/Message/MessageRenderViews/MessageView.swift
@@ -87,7 +87,7 @@ struct MessageView: View, Equatable {
 					VStack(alignment: .leading, spacing: Self.lineSpacing) {
                         if !shrunk {
                             HStack(spacing: 6) {
-                                Text(message.member?.nick ?? message.author.username)
+                                Text(message.member?.nick ?? message.author.displayName)
                                     .font(.system(size: 15))
                                     .fontWeight(.medium)
 								if message.author.bot ?? false || message.webhook_id != nil {

diff --git a/Swiftcord/Views/Message/MessageRenderViews/ReferenceMessageView.swift b/Swiftcord/Views/Message/MessageRenderViews/ReferenceMessageView.swift
@@ -36,7 +36,7 @@ struct ReferenceMessageView: View {
 						)
 
 						Group {
-							Text(quotedMsg.author.username)
+							Text(quotedMsg.author.displayName)
 								.font(.system(size: 14))
 								.opacity(0.9)
 

diff --git a/Swiftcord/Views/Message/MessagesView.swift b/Swiftcord/Views/Message/MessagesView.swift
@@ -285,13 +285,13 @@ struct MessagesView: View {
             }
             .overlay {
                 let typingMembers = ctx.typingStarted[channel.id]?
-                    .map { $0.member?.nick ?? $0.member?.user?.username ?? "" } ?? []
+                    .map { $0.member?.nick ?? $0.member?.user?.displayName ?? "" } ?? []
 
                 if !typingMembers.isEmpty {
                     HStack {
                         // The dimensions are quite arbitrary
                         // FIXME: The animation broke, will have to fix it
-                        LottieView(name: "typing-animatiokn", play: .constant(true), width: 160, height: 160)
+                        LottieView(name: "typing-animation", play: .constant(true), width: 160, height: 160)
                             .lottieLoopMode(.loop)
                             .frame(width: 32, height: 24)
                         Group {

diff --git a/Swiftcord/Views/User/CurrentUserFooter.swift b/Swiftcord/Views/User/CurrentUserFooter.swift
@@ -98,14 +98,14 @@ struct CurrentUserFooter: View {
 					.controlSize(.small)
 
 					VStack(alignment: .leading, spacing: 0) {
-						Text(user.username).font(.headline)
+						Text(user.global_name ?? user.username).font(.headline)
 						Group {
 							if let customStatus = customStatus {
 								Text(customStatus.state ?? "")
 									.lineLimit(1)
 									.truncationMode(.tail)
 							} else {
-								Text("#" + user.discriminator)
+								Text(user.discriminator == "0" ? user.username : "#" + user.discriminator)
 							}
 						}.font(.system(size: 12)).opacity(0.75)
 					}