feat: apply codable URLString to URL property of world models

makinosp · Jul 28, 2024 · 981a2e6 · 981a2e6
1 parent 80221c3
commit 981a2e6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/Sources/VRCKit/Models/URLString.swift b/Sources/VRCKit/Models/URLString.swift
@@ -8,7 +8,11 @@
 import Foundation
 
 public struct URLString: Codable, Hashable {
-    let url: URL
+    public let url: URL
+
+    public init(url: URL) {
+        self.url = url
+    }
 
     public init(from decoder: any Decoder) throws {
         let container = try decoder.singleValueContainer()

diff --git a/Sources/VRCKit/Models/WorldModel.swift b/Sources/VRCKit/Models/WorldModel.swift
@@ -17,8 +17,8 @@ public struct World: Codable, Identifiable, Hashable {
     public let capacity: Int
     public let tags: [String]
     public let releaseStatus: ReleaseStatus
-    public let imageUrl: String
-    public let thumbnailImageUrl: String
+    public let imageUrl: URLString
+    public let thumbnailImageUrl: URLString
     public let namespace: String?
     public let organization: String
     public let previewYoutubeId: String?

diff --git a/Sources/VRCKit/PreviewServices/PreviewDataProvider.swift b/Sources/VRCKit/PreviewServices/PreviewDataProvider.swift
@@ -206,8 +206,8 @@ final class PreviewDataProvider {
             capacity: 32,
             tags: [],
             releaseStatus: .public,
-            imageUrl: "https://ul.h3z.jp/ecWPM0Wk.jpg",
-            thumbnailImageUrl: "https://ul.h3z.jp/ecWPM0Wk.jpg",
+            imageUrl: URLString(url: URL(string: "https://ul.h3z.jp/ecWPM0Wk.jpg")!),
+            thumbnailImageUrl: URLString(url: URL(string: "https://ul.h3z.jp/ecWPM0Wk.jpg")!),
             namespace: nil,
             organization: "",
             previewYoutubeId: "",