feat: apply safe decoding array to url strings array

Author: makinosp

Sources/VRCKit/Models/FriendModel.swift

@@ -11,7 +11,7 @@ extension Friend: ProfileElementRepresentable, LocationRepresentable {}
 
 public struct Friend {
     public let bio: String?
-    public var bioLinks: [String]
+    public var bioLinks: SafeDecodingArray<URL>
     public let currentAvatarImageUrl: String?
     public let currentAvatarThumbnailImageUrl: String?
     public let displayName: String
@@ -26,14 +26,16 @@ public struct Friend {
     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.bioLinks = try container.decodeIfPresent(
+            SafeDecodingArray<URL>.self,
+            forKey: .bioLinks
+        ) ?? SafeDecodingArray(elements: [])
         self.currentAvatarImageUrl = try container.decodeIfPresent(String.self, forKey: .currentAvatarImageUrl)
         self.currentAvatarThumbnailImageUrl = try container.decodeIfPresent(
             String.self,

Sources/VRCKit/Models/UserDetailModel.swift

@@ -13,7 +13,7 @@ public typealias Tag = String
 
 public struct UserDetail {
     public var bio: String?
-    public var bioLinks: [String]
+    public var bioLinks: SafeDecodingArray<URL>
     public let currentAvatarImageUrl: String?
     public let currentAvatarThumbnailImageUrl: String?
     public let displayName: String
@@ -38,7 +38,10 @@ 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) ?? []
+        bioLinks = try container.decodeIfPresent(
+            SafeDecodingArray<URL>.self,
+            forKey: .bioLinks
+        ) ?? SafeDecodingArray(elements: [])
         currentAvatarImageUrl = try container.decodeIfPresent(String.self, forKey: .currentAvatarImageUrl)
         currentAvatarThumbnailImageUrl = try container.decodeIfPresent(
             String.self,
@@ -72,7 +75,7 @@ public struct EditableUserInfo: Codable, Hashable {
 
     public init(detail: any ProfileDetailRepresentable) {
         self.bio = detail.bio ?? ""
-        self.bioLinks = []
+        self.bioLinks = detail.bioLinks.elements
         self.status = detail.status
         self.statusDescription = detail.statusDescription
         self.tags = detail.tags

Sources/VRCKit/Models/UserModel.swift

@@ -11,7 +11,7 @@ public struct User: ProfileDetailRepresentable {
     public let activeFriends: [String]
     public let allowAvatarCopying: Bool
     public let bio: String?
-    public var bioLinks: [String]
+    public var bioLinks: SafeDecodingArray<URL>
     public let currentAvatar: String
     public let currentAvatarAssetUrl: String
     public let currentAvatarImageUrl: String?
@@ -60,7 +60,10 @@ extension User: Codable {
         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.bioLinks = try container.decodeIfPresent(
+            SafeDecodingArray<URL>.self,
+            forKey: .bioLinks
+        ) ?? SafeDecodingArray(elements: [])
         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)

Sources/VRCKit/PreviewServices/PreviewDataProvider.swift

@@ -63,7 +63,7 @@ final class PreviewDataProvider {
             activeFriends: onlineFriends.map(\.id),
             allowAvatarCopying: false,
             bio: "This is the demo user.",
-            bioLinks: [],
+            bioLinks: SafeDecodingArray(elements: []),
             currentAvatar: "",
             currentAvatarAssetUrl: "",
             currentAvatarImageUrl: "",
@@ -120,7 +120,7 @@ final class PreviewDataProvider {
     ) -> Friend {
         Friend(
             bio: nil,
-            bioLinks: [],
+            bioLinks: SafeDecodingArray(elements: []),
             currentAvatarImageUrl: nil,
             currentAvatarThumbnailImageUrl: nil,
             displayName: "User_\(id.uuidString.prefix(8))",
@@ -147,7 +147,7 @@ final class PreviewDataProvider {
     ) -> UserDetail {
         UserDetail(
             bio: "Demo",
-            bioLinks: [],
+            bioLinks: SafeDecodingArray(elements: []),
             currentAvatarImageUrl: nil,
             currentAvatarThumbnailImageUrl: nil,
             displayName: "User_\(id.uuidString.prefix(8))",

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: [String] { get }
+    var bioLinks: SafeDecodingArray<URL> { get }
     var currentAvatarImageUrl: String? { get }
     var currentAvatarThumbnailImageUrl: String? { get }
     var displayName: String { get }