Merge pull request #71 from makinosp/develop

Develop

Sources/VRCKit/APIClient.swift

@@ -25,9 +25,8 @@ public final class APIClient {
 
     /// Initializes the API client with optional username and password.
     public init() {
-        let domainUrl = "https://api.vrchat.cloud"
-        baseUrl = "\(domainUrl)/api/1"
-        cookieManager = CookieManager(domainURL: domainUrl)
+        baseUrl = "\(Const.apiBaseUrl)/\(Const.apiVersion)"
+        cookieManager = CookieManager(domainURL: Const.apiBaseUrl)
     }
 
     /// Set username and password.

Sources/VRCKit/Models/InstanceModel.swift

@@ -64,6 +64,14 @@ public extension Instance {
         }
         return instanceTypeAlias.description
     }
+
+    var userPlatforms: [UserPlatform] {
+        [
+            platforms.android > 0 ? UserPlatform.android : nil,
+            platforms.ios > 0 ? UserPlatform.ios : nil,
+            platforms.standalonewindows > 0 ? UserPlatform.standalonewindows : nil
+        ].compactMap { $0 }
+    }
 }
 
 extension Instance.GroupAccessType {

Sources/VRCKit/Models/UserDetailModel.swift

@@ -30,3 +30,9 @@ public struct UserDetail: ProfileDetailRepresentable, LocationRepresentable {
     public let lastActivity: Date
     public let platform: UserPlatform
 }
+
+public extension UserDetail {
+    var url: URL? {
+        URL(string: [Const.homeBaseUrl, "user", id].joined(separator: "/"))
+    }
+}

Sources/VRCKit/Models/UserModel.swift

@@ -44,6 +44,9 @@ public extension User {
     var platform: UserPlatform {
         presence.platform
     }
+    var url: URL? {
+        URL(string: [Const.homeBaseUrl, "user", id].joined(separator: "/"))
+    }
 }
 
 public extension User {

Sources/VRCKit/Models/UserPlatformModel.swift

@@ -9,3 +9,19 @@ public enum UserPlatform: String, Codable {
     case android, ios, standalonewindows, web
     case blank = ""
 }
+
+extension UserPlatform: Identifiable {
+    public var id: String { self.rawValue }
+}
+
+extension UserPlatform: CustomStringConvertible {
+    public var description: String {
+        switch self {
+        case .android: "Android"
+        case .ios: "iOS"
+        case .standalonewindows: "PC"
+        case .web: "Web"
+        case .blank: ""
+        }
+    }
+}

Sources/VRCKit/Protocols/ImageUrlRepresentableProtocol.swift

@@ -13,9 +13,9 @@ public protocol ImageUrlRepresentable {
 
 public extension ImageUrlRepresentable {
     func replaceImageUrl(url: URL, resolution: ImageResolution) -> URL? {
-        guard resolution != .origin, Int(url.lastPathComponent) != nil else { return url }
+        guard resolution != .origin, let number = Int(url.lastPathComponent), number > 1 else { return url }
         var urlString = url.absoluteString
-        if let range = urlString.range(of: url.lastPathComponent, options: .backwards) {
+        if let range = urlString.range(of: number.description, options: .backwards) {
             urlString.replaceSubrange(range, with: resolution.description)
         }
         return URL(string: urlString)

Sources/VRCKit/Utils/Const.swift

@@ -0,0 +1,12 @@
+//
+//  Const.swift
+//  VRCKit
+//
+//  Created by makinosp on 2024/09/06.
+//
+
+public enum Const {
+    static let homeBaseUrl = "https://vrchat.com/home"
+    static let apiBaseUrl = "https://api.vrchat.cloud/api"
+    static let apiVersion = 1
+}