feat(user): show discord and guild join dates

lucasromanomr · Sep 28, 2023 · c2c38f6 · c2c38f6
1 parent 0d8d3bf
commit c2c38f6
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 1 deletion.
diff --git a/Swiftcord/Utils/Extensions/DiscordAPI/Guild+.swift b/Swiftcord/Utils/Extensions/DiscordAPI/Guild+.swift
@@ -10,3 +10,9 @@ import DiscordKitCore
 extension Guild {
  var isDMChannel: Bool { id == "@me" }
 }
+
+extension Guild {
+ func iconURL(size: Int = 240) -> String? {
+ icon != nil ? "\(DiscordKitConfig.default.cdnURL)icons/\(id)/\(icon!).webp?size=\(size)" : nil
+ }
+}
diff --git a/Swiftcord/Utils/Extensions/DiscordAPI/Snowflake+.swift b/Swiftcord/Utils/Extensions/DiscordAPI/Snowflake+.swift
@@ -13,3 +13,9 @@ extension Snowflake {
 
  var isDM: Bool { self == Self.DM_GUILD }
 }
+
+extension Snowflake {
+ var createdAt: Date? {
+ decodeToDate()
+ }
+}
diff --git a/Swiftcord/Views/ContentView.swift b/Swiftcord/Views/ContentView.swift
@@ -110,7 +110,7 @@ struct ContentView: View {
  ServerButton(
  selected: state.selectedGuildID == guild.id || loadingGuildID == guild.id,
  name: guild.properties.name,
- serverIconURL: guild.properties.icon != nil ? "\(DiscordKitConfig.default.cdnURL)icons/\(guild.id)/\(guild.properties.icon!).webp?size=240" : nil,
+ serverIconURL: guild.properties.iconURL(),
  isLoading: loadingGuildID == guild.id
  ) {
  state.selectedGuildID = guild.id

diff --git a/Swiftcord/Views/User/Avatar/UserAvatarView.swift b/Swiftcord/Views/User/Avatar/UserAvatarView.swift
@@ -94,6 +94,29 @@ struct UserAvatarView: View {
  .tint(.blue)
  }
 
+ Text("Member Since")
+ .font(.headline)
+ .textCase(.uppercase)
+ .padding(.top, 6)
+ HStack(spacing: 8) {
+ Image("DiscordIcon").resizable().aspectRatio(contentMode: .fit).frame(width: 16)
+ Text(user.id.createdAt?.formatted(.dateTime.day().month().year()) ?? "Unknown")
+
+ Circle().fill(Color(nsColor: .separatorColor)).frame(width: 4, height: 4)
+
+ if let iconURL = ctx.guild?.properties.iconURL(size: 32), let url = URL(string: iconURL) {
+ BetterImageView(url: url).frame(width: 16).clipShape(Circle())
+ } else {
+ Text("\(ctx.guild?.properties.name ?? "")")
+ .font(.caption)
+ .fixedSize()
+ .frame(width: 16, height: 16, alignment: .leading)
+ .background(.gray.opacity(0.5))
+ .clipShape(Circle())
+ }
+ Text(member?.joined_at.formatted(.dateTime.day().month().year()) ?? "Unknown")
+ }
+
  if guildID != "@me" {
  let guildRoles = ctx.roles
  let roles = guildRoles.filter {