use URLs instead of Strings

planetary-social · Sep 19, 2024 · 8411704 · 8411704
1 parent ebe415d
commit 8411704
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/Nos/Models/OpenGraph/OpenGraphMetatdata.swift b/Nos/Models/OpenGraph/OpenGraphMetatdata.swift
@@ -18,7 +18,7 @@ struct OpenGraphMetadata: Equatable {
 /// Open Graph metadata for media, such as an image or video.
 struct OpenGraphMedia: Equatable {
     /// The URL of the media.
-    let url: String?
+    let url: URL?
 
     /// The width of the media.
     let width: Double?
@@ -31,7 +31,7 @@ struct OpenGraphMedia: Equatable {
     ///   - url: The URL of the media.
     ///   - width: The width of the media.
     ///   - height: The height of the media.
-    init?(url: String?, width: Double?, height: Double?) {
+    init?(url: URL?, width: Double?, height: Double?) {
         if url == nil && width == nil && height == nil {
             return nil
         }

diff --git a/Nos/Models/OpenGraph/SoupOpenGraphParser.swift b/Nos/Models/OpenGraph/SoupOpenGraphParser.swift
@@ -85,13 +85,13 @@ extension SoupOpenGraphParser {
     /// - Returns: The Open Graph image URL, or `nil` if none is found.
     /// - Note: The image URL may be in a variety of properties, including `"og:image"`, `"og:image:url`, or
     ///        `"og:image:secure_url"`.
-    func imageURL(from document: Document) -> String? {
+    func imageURL(from document: Document) -> URL? {
         if let url = stringValue(.image, from: document), !url.isEmpty {
-            return url
+            return URL(string: url)
         } else if let url = stringValue(.imageURL, from: document), !url.isEmpty {
-            return url
+            return URL(string: url)
         } else if let url = stringValue(.imageSecureURL, from: document), !url.isEmpty {
-            return url
+            return URL(string: url)
         } else {
             return nil
         }
@@ -102,13 +102,13 @@ extension SoupOpenGraphParser {
     /// - Returns: The Open Graph video URL, or `nil` if none is found.
     /// - Note: The video URL may be in a variety of properties, including `"og:video"`, `"og:video:url`, or
     ///        `"og:video:secure_url"`.
-    func videoURL(from document: Document) -> String? {
+    func videoURL(from document: Document) -> URL? {
         if let url = stringValue(.video, from: document), !url.isEmpty {
-            return url
+            return URL(string: url)
         } else if let url = stringValue(.videoURL, from: document), !url.isEmpty {
-            return url
+            return URL(string: url)
         } else if let url = stringValue(.videoSecureURL, from: document), !url.isEmpty {
-            return url
+            return URL(string: url)
         } else {
             return nil
         }

diff --git a/NosTests/Models/OpenGraph/SoupOpenGraphParserTests.swift b/NosTests/Models/OpenGraph/SoupOpenGraphParserTests.swift
@@ -20,11 +20,11 @@ class SoupOpenGraphParserTests: XCTestCase {
         // Assert
         XCTAssertEqual(metadata.type, .video)
 
-        XCTAssertEqual(metadata.video?.url, "https://example.com/movie.swf")
+        XCTAssertEqual(metadata.video?.url?.absoluteString, "https://example.com/movie.swf")
         XCTAssertEqual(metadata.video?.width, 2560)
         XCTAssertEqual(metadata.video?.height, 1440)
 
-        XCTAssertEqual(metadata.image?.url, "https://example.com/rock.jpg")
+        XCTAssertEqual(metadata.image?.url?.absoluteString, "https://example.com/rock.jpg")
         XCTAssertEqual(metadata.image?.width, 1280)
         XCTAssertEqual(metadata.image?.height, 720)
     }
@@ -40,8 +40,8 @@ class SoupOpenGraphParserTests: XCTestCase {
         // Assert
         XCTAssertEqual(metadata.type, .unknown)
 
-        XCTAssertEqual(metadata.video?.url, "https://example.com/rock.mp4")
-        XCTAssertEqual(metadata.image?.url, "https://example.com/rock.jpg")
+        XCTAssertEqual(metadata.video?.url?.absoluteString, "https://example.com/rock.mp4")
+        XCTAssertEqual(metadata.image?.url?.absoluteString, "https://example.com/rock.jpg")
     }
 
     func test_parse_sample_video_missing_metadata() throws {
@@ -73,7 +73,7 @@ class SoupOpenGraphParserTests: XCTestCase {
         // Assert
         XCTAssertEqual(metadata.type, .website)
 
-        XCTAssertEqual(metadata.image?.url, "https://example.com/rock.jpg")
+        XCTAssertEqual(metadata.image?.url?.absoluteString, "https://example.com/rock.jpg")
         XCTAssertEqual(metadata.image?.width, 640)
         XCTAssertEqual(metadata.image?.height, 480)
     }
@@ -104,7 +104,7 @@ class SoupOpenGraphParserTests: XCTestCase {
 
         XCTAssertEqual(metadata.type, .video)
 
-        XCTAssertEqual(metadata.video?.url, "https://www.youtube.com/embed/ZILsHowUjpQ")
+        XCTAssertEqual(metadata.video?.url?.absoluteString, "https://www.youtube.com/embed/ZILsHowUjpQ")
         XCTAssertEqual(metadata.video?.width, 1280)
         XCTAssertEqual(metadata.video?.height, 720)