Merge pull request #88 from makinosp/develop

Develop

Author: makinosp

.swiftlint.yml

@@ -5,7 +5,8 @@ disabled_rules:
 
 opt_in_rules:
   - array_init
-  - attributes
+  - attributes:
+    attributes_with_arguments_always_on_line_above: false
   - closure_end_indentation
   - closure_spacing
   - collection_alignment
@@ -21,7 +22,7 @@ opt_in_rules:
   - fatal_error_message
   - first_where
   - flatmap_over_map_reduce
-  # - force_unwrapping
+  - force_unwrapping
   - identical_operands
   - implicit_return
   - implicitly_unwrapped_optional

Sources/VRCKit/Models/AuthenticationModel.swift renamed to Sources/VRCKit/Models/Authentication/AuthenticationModel.swift

@@ -23,7 +23,9 @@ struct VerifyResponse: Codable, Sendable {
 
 struct RequiresTwoFactorAuthResponse: Codable, Sendable {
     let requiresTwoFactorAuth: [VerifyType]
+}
 
+extension RequiresTwoFactorAuthResponse {
     var requires: VerifyType? {
         requiresTwoFactorAuth.first { [.totp, .emailOtp].contains($0) }
     }

Sources/VRCKit/Models/CommonModels.swift

@@ -13,6 +13,12 @@ public struct ResponseMessage: Codable, Sendable {
     public let statusCode: Int
 }
 
+public extension ResponseMessage {
+    static var ok: ResponseMessage {
+        ResponseMessage(message: "OK", statusCode: 200)
+    }
+}
+
 @MemberwiseInit(.public)
 public struct SuccessResponse: Codable, Sendable {
     public let success: ResponseMessage

Sources/VRCKit/Models/FavoriteModel.swift renamed to Sources/VRCKit/Models/Favorite/FavoriteModel.swift

@@ -8,10 +8,14 @@
 import Foundation
 import MemberwiseInit
 
-public enum FavoriteType: String, Codable, Sendable {
+public enum FavoriteType: String, Codable, Sendable, CaseIterable {
     case world, avatar, friend
 }
 
+extension FavoriteType: Identifiable {
+    public var id: Int { hashValue }
+}
+
 @MemberwiseInit(.public)
 public struct Favorite: Codable, Sendable, Identifiable {
     public let id: String
@@ -23,8 +27,10 @@ public struct Favorite: Codable, Sendable, Identifiable {
 public struct FavoriteDetail: Sendable, Identifiable {
     public let id: String
     public let favorites: [Favorite]
+}
 
-    public func allFavoritesAre(_ type: FavoriteType) -> Bool {
+public extension FavoriteDetail {
+    func allFavoritesAre(_ type: FavoriteType) -> Bool {
         favorites.allSatisfy { $0.type == type }
     }
 }
@@ -52,4 +58,5 @@ struct RequestToAddFavorite: Codable, Sendable {
 struct RequestToUpdateFavoriteGroup: Codable, Sendable {
     let displayName: String?
     let visibility: FavoriteGroup.Visibility?
+    let tags: [String]
 }

Sources/VRCKit/Models/FriendModel+Decodable.swift renamed to Sources/VRCKit/Models/Friend/FriendModel+Decodable.swift

@@ -12,10 +12,10 @@ extension Friend: Decodable {
         let container = try decoder.container(keyedBy: CodingKeys.self)
         bio = try container.decodeIfPresent(String.self, forKey: .bio)
         bioLinks = try container.decodeSafeNullableArray(URL.self, forKey: .bioLinks)
-        avatarImageUrl = try container.decodeIfPresent(URL.self, forKey: .avatarImageUrl)
-        avatarThumbnailUrl = try container.decodeIfPresent(URL.self, forKey: .avatarThumbnailUrl)
+        avatarImageUrl = try container.decodeIfPresent(URL.self, forKey: .currentAvatarImageUrl)
+        avatarThumbnailUrl = try container.decodeIfPresent(URL.self, forKey: .currentAvatarThumbnailImageUrl)
         displayName = try container.decode(String.self, forKey: .displayName)
-        id = try container.decode(String.self, forKey: .id)
+        id = try container.decode(Friend.ID.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)
@@ -34,8 +34,8 @@ extension Friend {
     private enum CodingKeys: String, CodingKey {
         case bio
         case bioLinks
-        case avatarImageUrl = "currentAvatarImageUrl"
-        case avatarThumbnailUrl = "currentAvatarThumbnailImageUrl"
+        case currentAvatarImageUrl
+        case currentAvatarThumbnailImageUrl
         case displayName
         case id
         case isFriend

Sources/VRCKit/Models/FriendModel.swift renamed to Sources/VRCKit/Models/Friend/FriendModel.swift

@@ -5,13 +5,13 @@
 //  Created by makinosp on 2024/09/02.
 //
 
-public enum ImageResolution: Int, Sendable, CustomStringConvertible {
+public enum ImageResolution: Int, Sendable {
     case x256 = 256
     case x512 = 512
     case x1024 = 1024
     case origin = 0
+}
 
-    public var description: String {
-        rawValue.description
-    }
+extension ImageResolution: CustomStringConvertible {
+    public var description: String { rawValue.description }
 }

Sources/VRCKit/Models/ImageResolution.swift

@@ -6,18 +6,14 @@
 //
 
 import Foundation
+import MemberwiseInit
 
+@MemberwiseInit(.public)
 public struct OptionalISO8601Date: Sendable {
-    public let date: Date?
+    @Init(default: nil) public let date: Date?
     private let formatter = DateFormatter.iso8601Full
 }
 
-public extension OptionalISO8601Date {
-    init() {
-        date = nil
-    }
-}
-
 extension OptionalISO8601Date: Decodable {
     public init(from decoder: any Decoder) throws {
         let container = try decoder.singleValueContainer()
@@ -39,7 +35,7 @@ extension OptionalISO8601Date: Decodable {
 extension OptionalISO8601Date: Encodable {
     public func encode(to encoder: Encoder) throws {
         var container = encoder.singleValueContainer()
-        if let date = self.date {
+        if let date = date {
             let dateString = formatter.string(from: date)
             try container.encode(dateString)
         } else {

Sources/VRCKit/Utils/OptionalISO8601Date.swift renamed to Sources/VRCKit/Models/OptionalISO8601Date.swift

@@ -0,0 +1,29 @@
+//
+//  SafeDecoding.swift
+//  VRCKit
+//
+//  Created by makinosp on 2024/09/30.
+//
+
+import MemberwiseInit
+
+@propertyWrapper @MemberwiseInit(.public)
+public struct SafeDecoding<T> {
+    @Init(default: nil) public var wrappedValue: T?
+}
+
+extension SafeDecoding: Decodable where T: Decodable {
+    public init(from decoder: Decoder) throws {
+        let container = try decoder.singleValueContainer()
+        wrappedValue = try? container.decode(T.self)
+    }
+}
+
+extension SafeDecoding: Identifiable where T: Identifiable {
+    public var id: T.ID? { wrappedValue?.id }
+}
+
+extension SafeDecoding: Encodable where T: Encodable {}
+extension SafeDecoding: Equatable where T: Equatable {}
+extension SafeDecoding: Hashable where T: Hashable {}
+extension SafeDecoding: Sendable where T: Sendable {}

Sources/VRCKit/Models/SafeDecoding.swift

@@ -0,0 +1,38 @@
+//
+//  SafeDecodingArray.swift
+//  VRCKit
+//
+//  Created by makinosp on 2024/07/28.
+//
+
+import MemberwiseInit
+
+@propertyWrapper @MemberwiseInit(.public)
+public struct SafeDecodingArray<T> {
+    @Init(default: []) public var wrappedValue: [T]
+}
+
+extension SafeDecodingArray: Decodable where T: Decodable {
+    private struct AnyDecodable: Decodable {}
+    public init(from decoder: Decoder) throws {
+        wrappedValue = []
+        var container = try decoder.unkeyedContainer()
+        while !container.isAtEnd {
+            if let value = try? container.decode(T.self) {
+                wrappedValue.append(value)
+            } else {
+                _ = try container.decode(AnyDecodable.self)
+            }
+        }
+    }
+}
+
+extension SafeDecodingArray: Hashable where T: Hashable {
+    public static func == (lhs: SafeDecodingArray<T>, rhs: SafeDecodingArray<T>) -> Bool {
+        lhs.wrappedValue.hashValue == rhs.wrappedValue.hashValue
+    }
+}
+
+extension SafeDecodingArray: Encodable where T: Encodable {}
+extension SafeDecodingArray: Equatable where T: Equatable {}
+extension SafeDecodingArray: Sendable where T: Sendable {}