Use GravatarURL in more places (#22624)

Co-authored-by: Pinar Olguc <[email protected]>
wordpress-mobile · Feb 16, 2024 · 74fdffc · 74fdffc
1 parent a061bb7
commit 74fdffc
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 8 deletions.
diff --git a/WordPress/Classes/ViewRelated/Comments/CommentContentTableViewCell.swift b/WordPress/Classes/ViewRelated/Comments/CommentContentTableViewCell.swift
@@ -1,5 +1,6 @@
 import UIKit
 import WordPressUI
+import Gravatar
 
 class CommentContentTableViewCell: UITableViewCell, NibReusable {
 
@@ -357,7 +358,7 @@ private extension CommentContentTableViewCell {
     /// If the URL does not contain any image, the default placeholder image will be displayed.
     /// - Parameter url: The URL containing the image.
     func configureImage(with url: URL?) {
-        if let someURL = url, let gravatar = Gravatar(someURL) {
+        if let someURL = url, let gravatar = GravatarURL(someURL) {
             avatarImageView.downloadGravatar(gravatar, placeholder: Style.placeholderImage, animate: true)
             return
         }

diff --git a/WordPress/Classes/ViewRelated/Notifications/Views/NoteBlockCommentTableViewCell.swift b/WordPress/Classes/ViewRelated/Notifications/Views/NoteBlockCommentTableViewCell.swift
@@ -1,6 +1,7 @@
 import Foundation
 import WordPressShared.WPStyleGuide
 import WordPressUI
+import Gravatar
 
 // MARK: - NoteBlockCommentTableViewCell Renders a Comment Block Onscreen
 //
@@ -99,7 +100,7 @@ class NoteBlockCommentTableViewCell: NoteBlockTextTableViewCell {
     // MARK: - Public Methods
 
     @objc func downloadGravatarWithURL(_ url: URL?) {
-        let gravatar = url.flatMap { Gravatar($0) }
+        let gravatar = url.flatMap { GravatarURL($0) }
 
         gravatarImageView.downloadGravatar(gravatar, placeholder: placeholderImage, animate: true)
     }

diff --git a/WordPress/Classes/ViewRelated/Notifications/Views/NoteBlockHeaderTableViewCell.swift b/WordPress/Classes/ViewRelated/Notifications/Views/NoteBlockHeaderTableViewCell.swift
@@ -1,6 +1,7 @@
 import Foundation
 import WordPressShared.WPStyleGuide
 import WordPressUI
+import Gravatar
 
 // MARK: - NoteBlockHeaderTableViewCell
 //
@@ -67,7 +68,7 @@ class NoteBlockHeaderTableViewCell: NoteBlockTableViewCell {
             return
         }
 
-        if let gravatar = Gravatar(url) {
+        if let gravatar = GravatarURL(url) {
             authorAvatarImageView.downloadGravatar(gravatar, placeholder: .gravatarPlaceholderImage, animate: true)
         } else {
             authorAvatarImageView.downloadSiteIcon(at: url.absoluteString)

diff --git a/WordPress/Classes/ViewRelated/Notifications/Views/NoteBlockUserTableViewCell.swift b/WordPress/Classes/ViewRelated/Notifications/Views/NoteBlockUserTableViewCell.swift
@@ -1,6 +1,7 @@
 import Foundation
 import WordPressShared
 import WordPressUI
+import Gravatar
 
 class NoteBlockUserTableViewCell: NoteBlockTableViewCell {
     typealias EventHandler = (() -> Void)
@@ -54,7 +55,7 @@ class NoteBlockUserTableViewCell: NoteBlockTableViewCell {
             return
         }
 
-        let gravatar = url.flatMap { Gravatar($0) }
+        let gravatar = url.flatMap { GravatarURL($0) }
         gravatarImageView.downloadGravatar(gravatar, placeholder: .gravatarPlaceholderImage, animate: true)
 
         gravatarURL = url

diff --git a/WordPress/Classes/ViewRelated/People/PeopleCell.swift b/WordPress/Classes/ViewRelated/People/PeopleCell.swift
@@ -1,6 +1,7 @@
 import UIKit
 import WordPressShared
 import WordPressUI
+import Gravatar
 
 class PeopleCell: WPTableViewCell {
     @IBOutlet private weak var avatarImageView: CircularImageView!
@@ -36,7 +37,7 @@ class PeopleCell: WPTableViewCell {
     }
 
     @objc func setAvatarURL(_ avatarURL: URL?) {
-        let gravatar = avatarURL.flatMap { Gravatar($0) }
+        let gravatar = avatarURL.flatMap { GravatarURL($0) }
         let placeholder = UIImage(named: "gravatar")!
         avatarImageView.downloadGravatar(gravatar, placeholder: placeholder, animate: false)
     }

diff --git a/WordPress/Classes/ViewRelated/People/PersonViewController.swift b/WordPress/Classes/ViewRelated/People/PersonViewController.swift
@@ -3,6 +3,7 @@ import UIKit
 import CocoaLumberjack
 import WordPressShared
 import WordPressUI
+import Gravatar
 
 /// Displays a Blog's User Details
 ///
@@ -507,7 +508,7 @@ private extension PersonViewController {
     }
 
     func refreshGravatarImage(in imageView: UIImageView) {
-        let gravatar = person.avatarURL.flatMap { Gravatar($0) }
+        let gravatar = person.avatarURL.flatMap { GravatarURL($0) }
         let placeholder = UIImage(named: "gravatar")!
         imageView.downloadGravatar(gravatar, placeholder: placeholder, animate: false)
     }

diff --git a/WordPress/Classes/ViewRelated/Post/Revisions/Views/Cell/RevisionsTableViewCell.swift b/WordPress/Classes/ViewRelated/Post/Revisions/Views/Cell/RevisionsTableViewCell.swift
@@ -1,5 +1,6 @@
 import Gridicons
 import WordPressUI
+import Gravatar
 
 class RevisionsTableViewCell: UITableViewCell {
     static let reuseIdentifier = "RevisionsTableViewCellIdentifier"
@@ -43,7 +44,7 @@ class RevisionsTableViewCell: UITableViewCell {
             if let avatarURL = avatarURL,
                 let placeholder = UIImage(named: "gravatar") {
                 let url = URL(string: avatarURL)
-                avatarImageView.downloadGravatar(url.flatMap { Gravatar($0) },
+                avatarImageView.downloadGravatar(url.flatMap { GravatarURL($0) },
                                                  placeholder: placeholder,
                                                  animate: false)
             }

diff --git a/WordPress/WordPressNotificationContentExtension/Sources/Views/NotificationContentView.swift b/WordPress/WordPressNotificationContentExtension/Sources/Views/NotificationContentView.swift
@@ -2,6 +2,7 @@ import UIKit
 
 import WordPressShared
 import WordPressUI
+import Gravatar
 
 // MARK: - NotificationContentView
 
@@ -186,7 +187,7 @@ extension NotificationContentView {
     func downloadGravatar() {
         guard let specifiedGravatar = viewModel.gravatarURLString,
             let validURL = URL(string: specifiedGravatar),
-            let gravatar = Gravatar(validURL) else {
+            let gravatar = GravatarURL(validURL) else {
 
             return
         }