Merge pull request #141 from Automattic/etoledom/is-gravatar-url

Adding `isGravatarURL` extension.
Automattic · Mar 27, 2024 · 4eaa1d0 · 4eaa1d0
2 parents c34bf6a + d8c849d
commit 4eaa1d0
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/Sources/Gravatar/AvatarURL.swift b/Sources/Gravatar/AvatarURL.swift
@@ -35,15 +35,7 @@ public struct AvatarURL {
     }
 
     public static func isAvatarURL(_ url: URL) -> Bool {
-        guard
-            let components = URLComponents(url: url, resolvingAgainstBaseURL: false),
-            let host = components.host
-        else {
-            return false
-        }
-
-        return (host.hasSuffix(".gravatar.com") || host == "gravatar.com")
-            && components.path.hasPrefix("/avatar/")
+        url.isGravatarURL && url.path.hasPrefix("/avatar/")
     }
 
     public func replacing(options: AvatarQueryOptions) -> AvatarURL? {

diff --git a/Sources/Gravatar/Extensions/URL.swift b/Sources/Gravatar/Extensions/URL.swift
@@ -9,4 +9,17 @@ extension URL {
             self.appendingPathComponent(path)
         }
     }
+
+    /// Whether this URL instance corresponds to a valid Gravatar URL.
+    var isGravatarURL: Bool {
+        guard
+            let components = URLComponents(url: self, resolvingAgainstBaseURL: false),
+            let host = components.host
+        else {
+            return false
+        }
+
+        return (host.hasSuffix(".gravatar.com") || host == "gravatar.com")
+            && components.scheme == "https"
+    }
 }