From ef77c9658565b1060aa9ceff99c060d65f42379b Mon Sep 17 00:00:00 2001 From: kean Date: Wed, 18 Jun 2025 13:32:18 -0400 Subject: [PATCH 1/3] Add search_text parameter to Activity Logs --- Sources/WordPressKit/Services/ActivityServiceRemote.swift | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Sources/WordPressKit/Services/ActivityServiceRemote.swift b/Sources/WordPressKit/Services/ActivityServiceRemote.swift index 317462bb..99ea34e0 100644 --- a/Sources/WordPressKit/Services/ActivityServiceRemote.swift +++ b/Sources/WordPressKit/Services/ActivityServiceRemote.swift @@ -33,6 +33,7 @@ open class ActivityServiceRemote: ServiceRemoteWordPressComREST { after: Date? = nil, before: Date? = nil, group: [String] = [], + searchText: String? = nil, success: @escaping (_ activities: [Activity], _ hasMore: Bool) -> Void, failure: @escaping (Error) -> Void) { @@ -51,6 +52,9 @@ open class ActivityServiceRemote: ServiceRemoteWordPressComREST { } else if let on = after ?? before { path?.queryItems?.append(URLQueryItem(name: "on", value: formatter.string(from: on))) } + if let searchText, !searchText.isEmpty { + path?.queryItems?.append(URLQueryItem(name: "text_search", value: searchText)) + } guard let endpoint = path?.string else { return From 30dadcab01a980eb16976340c1e9e8a9527ddc05 Mon Sep 17 00:00:00 2001 From: kean Date: Wed, 18 Jun 2025 13:33:16 -0400 Subject: [PATCH 2/3] Update Package.swift --- Package.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Package.swift b/Package.swift index dcc9c7af..4c7c06e8 100644 --- a/Package.swift +++ b/Package.swift @@ -11,8 +11,8 @@ let package = Package( targets: [ .binaryTarget( name: "WordPressKit", - url: "https://github.com/user-attachments/files/20175119/WordPressKit.zip", - checksum: "13aa0e5952616a2f01a0f0db370ee7925d58253c2aab6e216671e8a013ab471b" + url: "https://github.com/user-attachments/files/20801891/WordPressKit.zip", + checksum: "a64680b161f04e5431109b2fcc513ed83356793309b3e1ba8d2fd0a8d128a3c9" ), ] ) From ae3961ce89ac0c43a90e88d4963a04aa92008443 Mon Sep 17 00:00:00 2001 From: kean Date: Thu, 19 Jun 2025 17:19:34 -0400 Subject: [PATCH 3/3] Add /rewindable --- Package.swift | 4 +-- .../Services/ActivityServiceRemote.swift | 25 +++++++++++-------- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/Package.swift b/Package.swift index 4c7c06e8..80b5bbb8 100644 --- a/Package.swift +++ b/Package.swift @@ -11,8 +11,8 @@ let package = Package( targets: [ .binaryTarget( name: "WordPressKit", - url: "https://github.com/user-attachments/files/20801891/WordPressKit.zip", - checksum: "a64680b161f04e5431109b2fcc513ed83356793309b3e1ba8d2fd0a8d128a3c9" + url: "https://github.com/user-attachments/files/20825728/WordPressKit.zip", + checksum: "097a2e55e4ec66b4d8c37bc49181df33c4b62ea9d130fac4de057a0867b68a69" ), ] ) diff --git a/Sources/WordPressKit/Services/ActivityServiceRemote.swift b/Sources/WordPressKit/Services/ActivityServiceRemote.swift index 99ea34e0..56a57cd1 100644 --- a/Sources/WordPressKit/Services/ActivityServiceRemote.swift +++ b/Sources/WordPressKit/Services/ActivityServiceRemote.swift @@ -27,17 +27,22 @@ open class ActivityServiceRemote: ServiceRemoteWordPressComREST { /// /// - Returns: An array of activities and a boolean indicating if there's more activities to fetch. /// - open func getActivityForSite(_ siteID: Int, - offset: Int = 0, - count: Int, - after: Date? = nil, - before: Date? = nil, - group: [String] = [], - searchText: String? = nil, - success: @escaping (_ activities: [Activity], _ hasMore: Bool) -> Void, - failure: @escaping (Error) -> Void) { - + open func getActivityForSite( + _ siteID: Int, + offset: Int = 0, + count: Int, + after: Date? = nil, + before: Date? = nil, + group: [String] = [], + rewindable: Bool? = nil, + searchText: String? = nil, + success: @escaping (_ activities: [Activity], _ hasMore: Bool) -> Void, + failure: @escaping (Error) -> Void + ) { var path = URLComponents(string: "sites/\(siteID)/activity") + if rewindable == true, let currentPath = path?.path { + path?.path = currentPath.appending("/rewindable") + } path?.queryItems = group.map { URLQueryItem(name: "group[]", value: $0) }