feat: implement custom decoder for nullable arrays

Author: makinosp

Sources/VRCKit/Models/FriendModel.swift

@@ -9,9 +9,9 @@ import Foundation
 
 extension Friend: ProfileElementRepresentable, LocationRepresentable {}
 
-public struct Friend: Codable {
+public struct Friend {
     public let bio: String?
-    @NullableArray public var bioLinks: [URL]
+    public var bioLinks: [String]
     public let currentAvatarImageUrl: String?
     public let currentAvatarThumbnailImageUrl: String?
     public let displayName: String
@@ -26,6 +26,32 @@ public struct Friend: Codable {
     public let userIcon: String?
     public let location: String
     public let friendKey: String
+
+}
+
+extension Friend: Codable {
+    public init(from decoder: any Decoder) throws {
+        let container = try decoder.container(keyedBy: CodingKeys.self)
+        self.bio = try container.decodeIfPresent(String.self, forKey: .bio)
+        self.bioLinks = try container.decodeIfPresent([String].self, forKey: .bioLinks) ?? []
+        self.currentAvatarImageUrl = try container.decodeIfPresent(String.self, forKey: .currentAvatarImageUrl)
+        self.currentAvatarThumbnailImageUrl = try container.decodeIfPresent(
+            String.self,
+            forKey: .currentAvatarThumbnailImageUrl
+        )
+        self.displayName = try container.decode(String.self, forKey: .displayName)
+        self.id = try container.decode(String.self, forKey: .id)
+        self.isFriend = try container.decode(Bool.self, forKey: .isFriend)
+        self.lastLogin = try container.decode(Date.self, forKey: .lastLogin)
+        self.lastPlatform = try container.decode(String.self, forKey: .lastPlatform)
+        self.profilePicOverride = try container.decodeIfPresent(String.self, forKey: .profilePicOverride)
+        self.status = try container.decode(UserStatus.self, forKey: .status)
+        self.statusDescription = try container.decode(String.self, forKey: .statusDescription)
+        self.tags = try container.decode([Tag].self, forKey: .tags)
+        self.userIcon = try container.decodeIfPresent(String.self, forKey: .userIcon)
+        self.location = try container.decode(String.self, forKey: .location)
+        self.friendKey = try container.decode(String.self, forKey: .friendKey)
+    }
 }
 
 extension FriendsLocation: LocationRepresentable {}

Sources/VRCKit/Models/UserDetailModel.swift

@@ -11,9 +11,9 @@ extension UserDetail: ProfileDetailRepresentable, LocationRepresentable {}
 
 public typealias Tag = String
 
-public struct UserDetail: Codable {
+public struct UserDetail {
     public var bio: String?
-    @NullableArray public var bioLinks: [URL]
+    public var bioLinks: [String]
     public let currentAvatarImageUrl: String?
     public let currentAvatarThumbnailImageUrl: String?
     public let displayName: String
@@ -34,6 +34,35 @@ public struct UserDetail: Codable {
     public let lastActivity: Date
 }
 
+extension UserDetail: Codable {
+    public init(from decoder: any Decoder) throws {
+        let container = try decoder.container(keyedBy: CodingKeys.self)
+        bio = try container.decodeIfPresent(String.self, forKey: .bio)
+        bioLinks = try container.decodeIfPresent([String].self, forKey: .bioLinks) ?? []
+        currentAvatarImageUrl = try container.decodeIfPresent(String.self, forKey: .currentAvatarImageUrl)
+        currentAvatarThumbnailImageUrl = try container.decodeIfPresent(
+            String.self,
+            forKey: .currentAvatarThumbnailImageUrl
+        )
+        displayName = try container.decode(String.self, forKey: .displayName)
+        id = try container.decode(String.self, forKey: .id)
+        isFriend = try container.decode(Bool.self, forKey: .isFriend)
+        lastLogin = try container.decode(Date.self, forKey: .lastLogin)
+        lastPlatform = try container.decode(String.self, forKey: .lastPlatform)
+        profilePicOverride = try container.decodeIfPresent(String.self, forKey: .profilePicOverride)
+        state = try container.decode(User.State.self, forKey: .state)
+        status = try container.decode(UserStatus.self, forKey: .status)
+        statusDescription = try container.decode(String.self, forKey: .statusDescription)
+        tags = try container.decode([Tag].self, forKey: .tags)
+        userIcon = try container.decodeIfPresent(String.self, forKey: .userIcon)
+        location = try container.decode(String.self, forKey: .location)
+        friendKey = try container.decode(String.self, forKey: .friendKey)
+        dateJoined = try container.decode(String.self, forKey: .dateJoined)
+        note = try container.decode(String.self, forKey: .note)
+        lastActivity = try container.decode(Date.self, forKey: .lastActivity)
+    }
+}
+
 public struct EditableUserInfo: Codable, Hashable {
     public var bio: String
     public var bioLinks: [URL]
@@ -43,7 +72,7 @@ public struct EditableUserInfo: Codable, Hashable {
 
     public init(detail: any ProfileDetailRepresentable) {
         self.bio = detail.bio ?? ""
-        self.bioLinks = detail.bioLinks
+        self.bioLinks = []
         self.status = detail.status
         self.statusDescription = detail.statusDescription
         self.tags = detail.tags

Sources/VRCKit/Models/UserModel.swift

@@ -7,11 +7,11 @@
 
 import Foundation
 
-public struct User: Codable, ProfileDetailRepresentable {
+public struct User: ProfileDetailRepresentable {
     public let activeFriends: [String]
     public let allowAvatarCopying: Bool
     public let bio: String?
-    @NullableArray public var bioLinks: [URL]
+    public var bioLinks: [String]
     public let currentAvatar: String
     public let currentAvatarAssetUrl: String
     public let currentAvatarImageUrl: String?
@@ -54,6 +54,45 @@ public struct User: Codable, ProfileDetailRepresentable {
     }
 }
 
+extension User: Codable {
+    public init(from decoder: any Decoder) throws {
+        let container = try decoder.container(keyedBy: CodingKeys.self)
+        self.activeFriends = try container.decode([String].self, forKey: .activeFriends)
+        self.allowAvatarCopying = try container.decode(Bool.self, forKey: .allowAvatarCopying)
+        self.bio = try container.decodeIfPresent(String.self, forKey: .bio)
+        self.bioLinks = try container.decodeIfPresent([String].self, forKey: .bioLinks) ?? []
+        self.currentAvatar = try container.decode(String.self, forKey: .currentAvatar)
+        self.currentAvatarAssetUrl = try container.decode(String.self, forKey: .currentAvatarAssetUrl)
+        self.currentAvatarImageUrl = try container.decodeIfPresent(String.self, forKey: .currentAvatarImageUrl)
+        self.currentAvatarThumbnailImageUrl = try container.decodeIfPresent(
+            String.self,
+            forKey: .currentAvatarThumbnailImageUrl
+        )
+        self.dateJoined = try container.decode(String.self, forKey: .dateJoined)
+        self.displayName = try container.decode(String.self, forKey: .displayName)
+        self.friendKey = try container.decode(String.self, forKey: .friendKey)
+        self.friends = try container.decode([String].self, forKey: .friends)
+        self.homeLocation = try container.decode(String.self, forKey: .homeLocation)
+        self.id = try container.decode(String.self, forKey: .id)
+        self.isFriend = try container.decode(Bool.self, forKey: .isFriend)
+        self.lastActivity = try container.decode(Date.self, forKey: .lastActivity)
+        self.lastLogin = try container.decode(Date.self, forKey: .lastLogin)
+        self.lastPlatform = try container.decode(String.self, forKey: .lastPlatform)
+        self.offlineFriends = try container.decode([String].self, forKey: .offlineFriends)
+        self.onlineFriends = try container.decode([String].self, forKey: .onlineFriends)
+        self.pastDisplayNames = try container.decode([User.DisplayName].self, forKey: .pastDisplayNames)
+        self.profilePicOverride = try container.decodeIfPresent(String.self, forKey: .profilePicOverride)
+        self.state = try container.decode(User.State.self, forKey: .state)
+        self.status = try container.decode(UserStatus.self, forKey: .status)
+        self.statusDescription = try container.decode(String.self, forKey: .statusDescription)
+        self.tags = try container.decode([Tag].self, forKey: .tags)
+        self.twoFactorAuthEnabled = try container.decode(Bool.self, forKey: .twoFactorAuthEnabled)
+        self.userIcon = try container.decodeIfPresent(String.self, forKey: .userIcon)
+        self.userLanguage = try container.decodeIfPresent(String.self, forKey: .userLanguage)
+        self.userLanguageCode = try container.decodeIfPresent(String.self, forKey: .userLanguageCode)
+    }
+}
+
 public struct UpdatedUser: Codable {
     public let bio: String?
     public let statusDescription: String?

Sources/VRCKit/Protocols/ProfileProtocols.swift

@@ -11,7 +11,7 @@ import Foundation
 /// This protocol can be adopted by structures such as User, Friend, and UserDetail.
 public protocol ProfileElementRepresentable: Hashable, Identifiable {
     var bio: String? { get }
-    var bioLinks: [URL] { get }
+    var bioLinks: [String] { get }
     var currentAvatarImageUrl: String? { get }
     var currentAvatarThumbnailImageUrl: String? { get }
     var displayName: String { get }