Merge pull request #104 from makinosp/develop

makinosp · web-flow · commit bb7aebc12451 · 2025-07-05T10:53:40.000+09:00
Develop
diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml
@@ -17,7 +17,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        swift: ["6.0"]
+        swift: ["6.1"]
     steps:
     - uses: actions/checkout@v4
     - uses: SwiftyLab/setup-swift@a0188eaa95c3af0db72e8697c2f0a91c514da86c
diff --git a/Package.resolved b/Package.resolved
diff --git a/Package.swift b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version: 6.0
+// swift-tools-version: 6.1
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
@@ -19,7 +19,7 @@ let package = Package(
         )
     ],
     dependencies: [
-        .package(url: "https://github.com/gohanlon/swift-memberwise-init-macro", from: "0.5.0")
+        .package(url: "https://github.com/gohanlon/swift-memberwise-init-macro", from: "0.5.2")
     ],
     targets: [
         .target(
diff --git a/Sources/VRCKit/Models/SafeDecodingArray.swift b/Sources/VRCKit/Models/SafeDecodingArray.swift
@@ -21,6 +21,7 @@ extension SafeDecodingArray: Decodable where T: Decodable {
             if let value = try? container.decode(T.self) {
                 wrappedValue.append(value)
             } else {
+                // Skip the decorder cursor
                 _ = try container.decode(AnyDecodable.self)
             }
         }
diff --git a/Sources/VRCKit/Models/Tag/SystemTagModel.swift b/Sources/VRCKit/Models/Tag/SystemTagModel.swift
@@ -31,6 +31,15 @@ public enum SystemTag: String, Hashable, Codable, Sendable {
     case systemWorldAccess = "system_world_access"
 }
 
+extension SystemTag {
+    static let rankTags: Set<Self> = [
+        .systemTrustVeteran,
+        .systemTrustTrusted,
+        .systemTrustKnown,
+        .systemTrustBasic
+    ]
+}
+
 extension SystemTag: Identifiable {
     public var id: String { rawValue }
 }
diff --git a/Sources/VRCKit/Models/Tag/TrustRankModel.swift b/Sources/VRCKit/Models/Tag/TrustRankModel.swift
@@ -10,20 +10,16 @@ public enum TrustRank: Equatable, Sendable {
 }
 
 public extension ProfileElementRepresentable {
+    var systemTag: SystemTag? {
+        SystemTag.rankTags.first { tags.systemTags.contains($0) }
+    }
     var trustRank: TrustRank {
-        let rankTags: [SystemTag] = [
-            .systemTrustVeteran,
-            .systemTrustTrusted,
-            .systemTrustKnown,
-            .systemTrustBasic
-        ]
-        let rankTag = rankTags.first { tags.systemTags.contains($0) }
-        guard let rankTag = rankTag else { return .visitor }
-        return switch rankTag {
+        switch systemTag {
         case .systemTrustVeteran: .trusted
         case .systemTrustTrusted: .known
         case .systemTrustKnown: .user
         case .systemTrustBasic: .newUser
+        case nil: .visitor
         default: .unknown
         }
     }
diff --git a/Sources/VRCKit/Models/UnityPackage/UnityPackageModel.swift b/Sources/VRCKit/Models/UnityPackage/UnityPackageModel.swift
@@ -11,7 +11,7 @@ import MemberwiseInit
 @MemberwiseInit(.public)
 public struct UnityPackage: Sendable, Identifiable, Hashable {
     public let id: String
-    @InitWrapper(type: SafeDecoding<URL>)
+    @InitWrapper(type: SafeDecoding<URL>.self)
     @SafeDecoding public var assetUrl: URL?
     public let assetVersion: Int
     public let createdAt: OptionalISO8601Date
diff --git a/Sources/VRCKit/Models/User/AgeVerificationModel.swift b/Sources/VRCKit/Models/User/AgeVerificationModel.swift
@@ -0,0 +1,12 @@
+//
+//  AgeVerificationModel.swift
+//  VRCKit
+//
+//  Created by makinosp on 2025/02/26.
+//
+
+public enum AgeVerificationStatus: String, Codable, Sendable {
+    case hidden
+    case verified
+    case over18 = "18+"
+}
diff --git a/Sources/VRCKit/Models/User/UserCodingKeys.swift b/Sources/VRCKit/Models/User/UserCodingKeys.swift
@@ -6,6 +6,8 @@
 //
 
 public enum UserCodingKeys: String, CodingKey {
+    case ageVerificationStatus
+    case ageVerified
     case bio
     case bioLinks
     case currentAvatarImageUrl
diff --git a/Sources/VRCKit/Models/User/UserDetailModel+Decodable.swift b/Sources/VRCKit/Models/User/UserDetailModel+Decodable.swift
@@ -10,6 +10,8 @@ import Foundation
 extension UserDetail: Decodable {
     public init(from decoder: Decoder) throws {
         let container = try decoder.container(keyedBy: UserCodingKeys.self)
+        ageVerificationStatus = try container.decode(AgeVerificationStatus.self, forKey: .ageVerificationStatus)
+        ageVerified = try container.decode(Bool.self, forKey: .ageVerified)
         bio = try container.decodeIfPresent(String.self, forKey: .bio)
         bioLinks = try container.decodeSafeNullableArray(URL.self, forKey: .bioLinks)
         avatarImageUrl = try? container.decodeIfPresent(URL.self, forKey: .currentAvatarImageUrl)
diff --git a/Sources/VRCKit/Models/User/UserDetailModel.swift b/Sources/VRCKit/Models/User/UserDetailModel.swift
@@ -10,6 +10,8 @@ import MemberwiseInit
 
 @MemberwiseInit(.public)
 public struct UserDetail: Sendable, ProfileDetailRepresentable, LocationRepresentable {
+    public let ageVerificationStatus: AgeVerificationStatus
+    public let ageVerified: Bool
     public var bio: String?
     public var bioLinks: SafeDecodingArray<URL>
     public let avatarImageUrl: URL?
diff --git a/Sources/VRCKit/Models/User/UserModel+Decodable.swift b/Sources/VRCKit/Models/User/UserModel+Decodable.swift
@@ -10,6 +10,8 @@ import Foundation
 extension User: Decodable {
     public init(from decoder: any Decoder) throws {
         let container = try decoder.container(keyedBy: UserCodingKeys.self)
+        ageVerificationStatus = try container.decode(AgeVerificationStatus.self, forKey: .ageVerificationStatus)
+        ageVerified = try container.decode(Bool.self, forKey: .ageVerified)
         activeFriends = try container.decode([String].self, forKey: .activeFriends)
         allowAvatarCopying = try container.decode(Bool.self, forKey: .allowAvatarCopying)
         bio = try container.decodeIfPresent(String.self, forKey: .bio)
diff --git a/Sources/VRCKit/Models/User/UserModel+Initializers.swift b/Sources/VRCKit/Models/User/UserModel+Initializers.swift
@@ -8,6 +8,8 @@
 public extension User {
     init(user: User, editedUserInfo: EditableUserInfo) {
         activeFriends = user.activeFriends
+        ageVerificationStatus = user.ageVerificationStatus
+        ageVerified = user.ageVerified
         allowAvatarCopying = user.allowAvatarCopying
         bio = editedUserInfo.bio
         bioLinks = SafeDecodingArray(wrappedValue: editedUserInfo.bioLinks)
diff --git a/Sources/VRCKit/Models/User/UserModel.swift b/Sources/VRCKit/Models/User/UserModel.swift
@@ -11,6 +11,8 @@ import MemberwiseInit
 @MemberwiseInit(.public)
 public struct User: Sendable, ProfileDetailRepresentable {
     public let activeFriends: [String]
+    public let ageVerificationStatus: AgeVerificationStatus
+    public let ageVerified: Bool
     public let allowAvatarCopying: Bool
     public let bio: String?
     public var bioLinks: SafeDecodingArray<URL>
diff --git a/Sources/VRCKit/Protocols/AuthenticationServiceProtocol.swift b/Sources/VRCKit/Protocols/AuthenticationServiceProtocol.swift
@@ -6,7 +6,6 @@
 //
 
 public protocol AuthenticationServiceProtocol: Sendable {
-
     /// Check if a user exists by their user ID.
     /// - Parameter userId: The ID of the user to check.
     /// - Returns: A boolean indicating if the user exists.
diff --git a/Sources/VRCKit/Protocols/ImageUrlRepresentableProtocol.swift b/Sources/VRCKit/Protocols/ImageUrlRepresentableProtocol.swift
@@ -20,6 +20,22 @@ public protocol ImageUrlRepresentable: Sendable {
 }
 
 public extension ImageUrlRepresentable {
+    /// Replaces the image URL with a specified resolution if applicable.
+    ///
+    /// This function modifies the last path component of the given URL,
+    /// changing it to the desired `ImageResolution` if the URL's current
+    /// last path component is a numeric value greater than 1. If the
+    /// specified resolution is `.origin` or if the URL’s last path
+    /// component does not meet the numeric requirements, the function
+    /// returns the original URL.
+    ///
+    /// - Parameters:
+    ///   - url: The original image URL to be modified.
+    ///   - resolution: The desired image resolution, used to replace the
+    ///                 numeric component in the URL if applicable.
+    ///
+    /// - Returns: A new URL with the specified resolution if replacement
+    ///            occurs, or the original URL if no replacement is needed.
     func replaceImageUrl(url: URL, resolution: ImageResolution) -> URL? {
         guard resolution != .origin, let number = Int(url.lastPathComponent), number > 1 else { return url }
         var urlString = url.absoluteString

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@ extension SafeDecodingArray: Decodable where T: Decodable {`
`21`	`21`	`if let value = try? container.decode(T.self) {`
`22`	`22`	`wrappedValue.append(value)`
`23`	`23`	`} else {`
	`24`	`+ // Skip the decorder cursor`
`24`	`25`	`_ = try container.decode(AnyDecodable.self)`
`25`	`26`	`}`
`26`	`27`	`}`