align with latest wprs

Author: jkmassel

Modules/Sources/WordPressCore/Users/DisplayUser.swift

@@ -1,4 +1,5 @@
 import Foundation
+import WordPressAPI
 
 public struct DisplayUser: Identifiable, Codable, Hashable, Sendable {
     public let id: Int64
@@ -8,7 +9,7 @@ public struct DisplayUser: Identifiable, Codable, Hashable, Sendable {
     public let lastName: String
     public let displayName: String
     public let profilePhotoUrl: URL?
-    public let role: String
+    public let role: UserRole
 
     public let emailAddress: String
     public let websiteUrl: String?
@@ -23,7 +24,7 @@ public struct DisplayUser: Identifiable, Codable, Hashable, Sendable {
         lastName: String,
         displayName: String,
         profilePhotoUrl: URL?,
-        role: String,
+        role: UserRole,
         emailAddress: String,
         websiteUrl: String?,
         biography: String?
@@ -49,7 +50,7 @@ public struct DisplayUser: Identifiable, Codable, Hashable, Sendable {
         lastName: "Smith",
         displayName: "John Smith",
         profilePhotoUrl: URL(string: "https://gravatar.com/avatar/58fc51586c9a1f9895ac70e3ca60886e?size=256"),
-        role: "administrator",
+        role: .administrator,
         emailAddress: "[email protected]",
         websiteUrl: "https://example.com",
         biography: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat."
@@ -68,3 +69,15 @@ extension DisplayUser {
             .joined(separator: " ")
     }
 }
+
+extension UserRole: @retroactive Codable {
+    public init(from decoder: any Decoder) throws {
+        let role = try decoder.singleValueContainer().decode(String.self)
+        self.init(role)
+    }
+
+    public func encode(to encoder: any Encoder) throws {
+        var container = encoder.singleValueContainer()
+        try container.encode(self.rawValue)
+    }
+}

Modules/Sources/WordPressCore/Users/UserService.swift

@@ -36,7 +36,7 @@ public actor UserService: UserServiceProtocol {
         }
     }
 
-    public func isCurrentUserCapableOf(_ capability: String) async -> Bool {
+    public func isCurrentUserCapableOf(_ capability: UserCapability) async -> Bool {
         await currentUser?.capabilities.keys.contains(capability) == true
     }
 

Modules/Sources/WordPressCore/Users/UserServiceProtocol.swift

@@ -4,7 +4,7 @@ import WordPressAPI
 public protocol UserServiceProtocol: Actor {
     func fetchUsers() async throws
 
-    func isCurrentUserCapableOf(_ capability: String) async -> Bool
+    func isCurrentUserCapableOf(_ capability: UserCapability) async -> Bool
 
     func setNewPassword(id: UserId, newPassword: String) async throws
 

WordPress/Classes/Services/CommentServiceRemoteCoreRESTAPI.swift

@@ -149,7 +149,7 @@ private extension RemoteComment {
         self.postID = NSNumber(value: comment.post)
 
         self.status = comment.status.commentStatusType?.description
-        self.type = comment.commentType.type
+        self.type = comment.commentType.rawValue
 
         if let ext = try? comment.additionalFields.parseWpcomCommentsExtension() {
             self.postTitle = ext.post?.title

WordPress/Classes/Users/UserProvider.swift

@@ -58,7 +58,7 @@ actor MockUserProvider: UserServiceProtocol {
         await userDataStore.listStream(query: .all)
     }
 
-    func isCurrentUserCapableOf(_ capability: String) async -> Bool {
+    func isCurrentUserCapableOf(_ capability: UserCapability) async -> Bool {
         true
     }
 

WordPress/Classes/Users/ViewModel/UserListViewModel.swift

@@ -126,7 +126,7 @@ class UserListViewModel: ObservableObject {
     }
 
     private func sortUsers(_ users: [DisplayUser]) -> [Section] {
-        Dictionary(grouping: users) { $0.id == currentUserId ? RoleSection.me : RoleSection.role($0.role) }
+        Dictionary(grouping: users) { $0.id == currentUserId ? RoleSection.me : RoleSection.role($0.role.rawValue) }
             .map { Section(id: $0.key, users: $0.value.sorted(by: { $0.username < $1.username })) }
             .sorted { $0.id < $1.id }
     }

WordPress/Classes/Users/Views/UserDetailsView.swift

@@ -55,7 +55,7 @@ struct UserDetailsView: View {
             .listRowInsets(.zero)
 
             Section {
-                makeRow(title: Strings.roleFieldTitle, content: user.role)
+                makeRow(title: Strings.roleFieldTitle, content: user.role.rawValue)
                 makeRow(title: Strings.emailAddressFieldTitle, content: user.emailAddress, link: user.emailAddress.asEmail())
                 if let website = user.websiteUrl, !website.isEmpty {
                     makeRow(title: Strings.websiteFieldTitle, content: website, link: URL(string: website))