Skip to content

Commit 459a09d

Browse files
authored
[Media Library] Update parameter key for number of items to fetch to be per_page (#14444)
2 parents 133b075 + 43c0679 commit 459a09d

File tree

2 files changed

+15
-4
lines changed

2 files changed

+15
-4
lines changed

Networking/Networking/Remote/MediaRemote.swift

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public class MediaRemote: Remote, MediaRemoteProtocol {
8989
completion: @escaping (Result<[Media], Error>) -> Void) {
9090
let parameters: [String: Any] = [
9191
ParameterKey.contextKey: context ?? Default.context,
92-
ParameterKey.pageSize: pageSize,
92+
ParameterKey.dotComPageSize: pageSize,
9393
ParameterKey.pageNumber: pageNumber,
9494
ParameterKey.fields: "ID,date,URL,thumbnails,title,alt,extension,mime_type,file",
9595
ParameterKey.mimeType: imagesOnly ? "image" : nil,
@@ -123,10 +123,10 @@ public class MediaRemote: Remote, MediaRemoteProtocol {
123123
pageSize: Int = 25,
124124
completion: @escaping (Result<[WordPressMedia], Error>) -> Void) {
125125
let parameters: [String: Any] = [
126-
ParameterKey.pageSize: pageSize,
126+
ParameterKey.dotOrgPageSize: pageSize,
127127
ParameterKey.pageNumber: pageNumber,
128128
ParameterKey.fieldsWordPressSite: ParameterValue.wordPressMediaFields,
129-
ParameterKey.mimeType: imagesOnly ? "image" : nil,
129+
ParameterKey.mediaType: imagesOnly ? "image" : nil,
130130
ParameterKey.wordPressMediaParent: productID
131131
].compactMapValues { $0 }
132132

@@ -294,13 +294,23 @@ public extension MediaRemote {
294294

295295
private enum ParameterKey {
296296
static let pageNumber: String = "page"
297-
static let pageSize: String = "number"
297+
// For dotcom API usage, we want to use "number"
298+
// https://developer.wordpress.com/docs/api/1.2/get/sites/%24site/media/
299+
static let dotComPageSize: String = "number"
300+
// For dotorg API usage, we want to use "per_page"
301+
// https://developer.wordpress.org/rest-api/reference/media/#arguments
302+
static let dotOrgPageSize: String = "per_page"
298303
static let wordPressMediaPostID: String = "post"
299304
static let altText: String = "alt"
300305
static let wordPressAltText: String = "alt_text"
301306
static let fields: String = "fields"
302307
static let fieldsWordPressSite: String = "_fields"
308+
// For dotcom API usage, we want to use "mime_type"
309+
// https://developer.wordpress.com/docs/api/1.2/get/sites/%24site/media/
303310
static let mimeType: String = "mime_type"
311+
// For dotorg API usage, we want to use "media_type"
312+
// https://developer.wordpress.org/rest-api/reference/media/#list-media
313+
static let mediaType: String = "media_type"
304314
static let postID: String = "post_ID"
305315
static let contextKey: String = "context"
306316
static let wordPressMediaParentID = "parent_id"

RELEASE-NOTES.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
- [*] Menu tab > Payments: in the "deposits" summary view at the top, all mentions of "deposits/deposit/deposited" have been renamed to "payouts/payout/paid out" respectively to match the renaming in web. [https://github.com/woocommerce/woocommerce-ios/pull/14402]
1919
- [*] Receipts: Added message confirming receipt sent to customer after successful payment. [https://github.com/woocommerce/woocommerce-ios/pull/14390]
2020
- [internal] Simplifies App Icon by only using a single image for all supported platforms. [https://github.com/woocommerce/woocommerce-ios/pull/14429]
21+
- [**] Media Library: On sites logged in with application password, when picking image from WordPress Media Library, all images will now load correctly. [https://github.com/woocommerce/woocommerce-ios/pull/14444]
2122
- [*] Dashboard: Performance card now shows cached Visitors and Conversion data correctly. [https://github.com/woocommerce/woocommerce-ios/pull/14438]
2223
- [internal] Updated WooCommerceScreenshot to make it work again for generating screenshots. [https://github.com/woocommerce/woocommerce-ios/pull/14335]
2324
- [*] Jetpack Setup: Added support for WordPress.com account creation. [https://github.com/woocommerce/woocommerce-ios/pull/14471]

0 commit comments

Comments
 (0)