Merge pull request #99 from makinosp/develop

Develop

Author: makinosp

.github/FUNDING.yml

@@ -0,0 +1,4 @@
+github: makinosp
+patreon: makinosp
+ko_fi: makinosp
+liberapay: makinon

Sources/VRCKit/Models/Favorite/FavoriteListModel.swift

@@ -5,6 +5,9 @@
 //  Created by makinosp on 2024/10/06.
 //
 
+import MemberwiseInit
+
+@MemberwiseInit(.public)
 public struct FavoriteList: Sendable, Identifiable {
     public let id: String
     public let favorites: [Favorite]

Sources/VRCKit/Models/World/InstanceModel.swift

@@ -28,7 +28,6 @@ public struct Instance: Sendable, Identifiable, Hashable, Decodable {
     public let userCount: Int
     public let world: World
 
-    @MemberwiseInit(.public)
     public struct Platforms: Sendable, Hashable, Codable {
         @Init(default: 0) public let android: Int
         @Init(default: 0) public let ios: Int
@@ -93,6 +92,18 @@ public extension Instance {
     }
 }
 
+public extension Instance.Platforms {
+    /// Initialize from an array of UserPlatform
+    /// - Parameter platforms: An array of UserPlatform
+    init(_ platforms: [UserPlatform]) {
+        self.init(
+            android: platforms.contains(.android) ? 1 : 0,
+            ios: platforms.contains(.ios) ? 1 : 0,
+            standalonewindows: platforms.contains(.standalonewindows) ? 1 : 0
+        )
+    }
+}
+
 extension Instance.GroupAccessType {
     var typeDescription: Instance.InstanceTypeAlias {
         switch self {

Sources/VRCKit/Protocols/AuthenticationServiceProtocol.swift

@@ -12,10 +12,10 @@ public protocol AuthenticationServiceProtocol: Sendable {
     /// - Returns: A boolean indicating if the user exists.
     func exists(userId: String) async throws -> Bool
 
-    /// Fetches the authenticated user's information or determines if two-factor authentication (2FA) verification is required.
-    /// - Returns: An `Either<User, VerifyType>` result, which is `.left(User)` if the user is successfully authenticated,
-    /// - Throws: An error if the request fails or if the response cannot be decoded. If an unexpected decoding issue occurs,
-    ///   it throws `VRCKitError.unexpected`.
+    /// Fetches the authenticated user's information or determines if 2FA verification is required.
+    /// - Returns: An `Either<User, VerifyType>` result.
+    /// - Throws: An error if the request fails or if the response cannot be decoded.
+    ///   If an unexpected decoding issue occurs,it throws `VRCKitError.unexpected`.
     func loginUserInfo() async throws -> Either<User, VerifyType>
 
     /// Verifies 2-factor authentication using either TOTP or Email OTP.

Sources/VRCKit/Protocols/ImageUrlRepresentableProtocol.swift

@@ -12,7 +12,8 @@ public protocol ImageUrlRepresentable: Sendable {
     ///
     /// - Parameters:
     ///   - url: The original image URL to modify.
-    ///   - resolution: The desired image resolution as an `ImageResolution` value. The original resolution is `.origin`.
+    ///   - resolution: The desired image resolution as an `ImageResolution` value.
+    ///     The original resolution is `.origin`.
     ///
     /// - Returns: A new URL with the last numeric component replaced by the specified resolution.
     func imageUrl(_ resolution: ImageResolution) -> URL?

Sources/VRCKit/Services/AuthenticationService.swift

@@ -30,7 +30,7 @@ public final actor AuthenticationService: APIService, AuthenticationServiceProto
         } catch _ as DecodingError {
             let result: RequiresTwoFactorAuthResponse = try Serializer.shared.decode(response.data)
             guard let requires = result.requires else {
-                throw VRCKitError.invalidResponse("\(result.requires?.rawValue)")
+                throw VRCKitError.invalidResponse(String(describing: result.requires?.rawValue))
             }
             return .right(requires)
         }