Merge pull request #75 from makinosp/develop

Develop

Author: makinosp

.swiftlint.yml

@@ -1,6 +1,7 @@
 disabled_rules:
   - identifier_name
   - multiple_closures_with_trailing_closure
+  - non_optional_string_data_conversion
 
 opt_in_rules:
   - array_init

Sources/VRCKit/Models/FavoriteWorldModel.swift

@@ -21,7 +21,7 @@ extension FavoriteWorldWrapper: Decodable {
             if let world = try? container.decode(World.self) {
                 worlds.append(world)
             } else {
-                try container.decode(AnyCodable.self)
+                _ = try container.decode(AnyCodable.self)
             }
         }
         self.worlds = worlds

Sources/VRCKit/Models/UserPlatformModel.swift

@@ -6,7 +6,7 @@
 //
 
 public enum UserPlatform: String, Codable {
-    case android, ios, standalonewindows, web
+    case android, ios, nativemobile, standalonewindows, web
     case blank = ""
 }
 
@@ -19,6 +19,7 @@ extension UserPlatform: CustomStringConvertible {
         switch self {
         case .android: "Android"
         case .ios: "iOS"
+        case .nativemobile: "Native Mobile"
         case .standalonewindows: "PC"
         case .web: "Web"
         case .blank: ""

Sources/VRCKit/PreviewServices/PreviewDataProvider.swift

@@ -15,6 +15,8 @@ public final class PreviewDataProvider {
     let userDetails: [UserDetail]
     let instances: [Instance]
 
+    static let iconImageUrl = URL(string: "https://www.mediafire.com/convkey/f444/fmivuoxwvdvnucx9g.jpg")
+
     private init() {
         let instance = Self.generateInstance(worldId: UUID(), instanceId: 0)
         let onlineFriendsSet: [FriendSet] = (0..<50).map { count in
@@ -65,8 +67,8 @@ public final class PreviewDataProvider {
             bio: "This is the demo user.",
             bioLinks: SafeDecodingArray(),
             currentAvatar: "",
-            avatarImageUrl: nil,
-            avatarThumbnailUrl: nil,
+            avatarImageUrl: PreviewDataProvider.iconImageUrl,
+            avatarThumbnailUrl: PreviewDataProvider.iconImageUrl,
             dateJoined: Date(),
             displayName: "usr_\(previewUserId.uuidString.prefix(8))",
             friendKey: "",
@@ -80,13 +82,13 @@ public final class PreviewDataProvider {
             offlineFriends: offlineFriends.map(\.id),
             onlineFriends: onlineFriends.map(\.id),
             pastDisplayNames: [],
-            profilePicOverride: nil,
+            profilePicOverride: PreviewDataProvider.iconImageUrl,
             state: .active,
             status: .active,
             statusDescription: "status",
             tags: UserTags(),
             twoFactorAuthEnabled: true,
-            userIcon: URL(string: "https://ul.h3z.jp/9gGIcerr.png"),
+            userIcon: PreviewDataProvider.iconImageUrl,
             userLanguage: nil,
             userLanguageCode: nil,
             presence: User.Presence()
@@ -119,21 +121,21 @@ public final class PreviewDataProvider {
         status: UserStatus
     ) -> Friend {
         Friend(
-            bio: nil,
+            bio: "Biography",
             bioLinks: SafeDecodingArray(),
-            avatarImageUrl: nil,
-            avatarThumbnailUrl: nil,
+            avatarImageUrl: iconImageUrl,
+            avatarThumbnailUrl: iconImageUrl,
             displayName: "User_\(id.uuidString.prefix(8))",
             id: "usr_\(id.uuidString)",
             isFriend: true,
             lastLogin: Date(),
             lastPlatform: "standalonewindows",
             platform: .blank,
-            profilePicOverride: nil,
+            profilePicOverride: iconImageUrl,
             status: status,
             statusDescription: "",
             tags: UserTags(),
-            userIcon: URL(string: "https://ul.h3z.jp/9gGIcerr.png"),
+            userIcon: iconImageUrl,
             location: location,
             friendKey: ""
         )
@@ -149,19 +151,19 @@ public final class PreviewDataProvider {
         UserDetail(
             bio: "Demo",
             bioLinks: SafeDecodingArray(),
-            avatarImageUrl: nil,
-            avatarThumbnailUrl: nil,
+            avatarImageUrl: iconImageUrl,
+            avatarThumbnailUrl: iconImageUrl,
             displayName: "User_\(id.uuidString.prefix(8))",
             id: "usr_\(id.uuidString)",
             isFriend: isFriend,
             lastLogin: Date(),
             lastPlatform: "standalonewindows",
-            profilePicOverride: nil,
+            profilePicOverride: iconImageUrl,
             state: state,
             status: status,
             statusDescription: "Demo",
             tags: UserTags(),
-            userIcon: URL(string: "https://ul.h3z.jp/9gGIcerr.png"),
+            userIcon: iconImageUrl,
             location: location,
             friendKey: "",
             dateJoined: Date(),
@@ -212,8 +214,8 @@ public final class PreviewDataProvider {
             capacity: 32,
             tags: [],
             releaseStatus: .public,
-            imageUrl: URL(string: "https://ul.h3z.jp/ecWPM0Wk.jpg"),
-            thumbnailImageUrl: URL(string: "https://ul.h3z.jp/ecWPM0Wk.jpg"),
+            imageUrl: Const.privateWorldImageUrl,
+            thumbnailImageUrl: Const.privateWorldImageUrl,
             namespace: nil,
             organization: "",
             previewYoutubeId: "",
@@ -228,4 +230,8 @@ public final class PreviewDataProvider {
             version: 1
         )
     }
+
+    public static func generateWorld() -> World {
+        generateWorld(worldId: UUID())
+    }
 }

Sources/VRCKit/PreviewServices/WorldPreviewService.swift

@@ -0,0 +1,16 @@
+//
+//  WorldPreviewService.swift
+//  VRCKit
+//
+//  Created by makinosp on 2024/09/09.
+//
+
+public final class WorldPreviewService: WorldService {
+    override public func fetchWorld(worldId: String) async throws -> World {
+        PreviewDataProvider.generateWorld()
+    }
+
+    override public func fetchFavoritedWorlds() async throws -> [World] {
+        (0..<10).map { _ in PreviewDataProvider.generateWorld() }
+    }
+}

Sources/VRCKit/Protocols/WorldServiceProtocol.swift

@@ -7,5 +7,6 @@
 
 // WorldServiceProtocol.swift
 public protocol WorldServiceProtocol {
+    func fetchWorld(worldId: String) async throws -> World
     func fetchFavoritedWorlds() async throws -> [World]
 }

Sources/VRCKit/Utils/Serializer.swift

@@ -39,7 +39,7 @@ final class Serializer {
                 // for debug
                 print(type(of: T.self))
                 print(error)
-                print(String(decoding: data, as: UTF8.self))
+                print(String(data: data, encoding: .utf8) ?? "")
                 throw error
             }
         }