From c90d040b40015db6e8906ab9a96eaad137bd5832 Mon Sep 17 00:00:00 2001 From: Ashish Bhate Date: Tue, 31 Aug 2021 19:20:10 +0530 Subject: [PATCH] [MM-36792] Consistent query param names (#5643) Summary Be consistent with query parameter names: use `per_page` instead of `pageSize` for the Thread API. The server will continue to support the `pageSize` parameter until version 6.0 of the server becomes the minimum server version required for the mobile app. Related PRs: [MM-36792] limit number of threads returned from SQL store mattermost-server#18260 [MM-36792] Consistent query param names mattermost-webapp#8700 Ticket Link https://mattermost.atlassian.net/browse/MM-36792 --- app/client/rest/posts.ts | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/app/client/rest/posts.ts b/app/client/rest/posts.ts index 1e38d52b4..b18966aae 100644 --- a/app/client/rest/posts.ts +++ b/app/client/rest/posts.ts @@ -4,7 +4,7 @@ import {analytics} from '@init/analytics'; import {FileInfo} from '@mm-redux/types/files'; import {Post} from '@mm-redux/types/posts'; -import {buildQueryString} from '@mm-redux/utils/helpers'; +import {buildQueryString, isMinimumServerVersion} from '@mm-redux/utils/helpers'; import {PER_PAGE_DEFAULT} from './constants'; @@ -126,9 +126,16 @@ const ClientPosts = (superclass: any) => class extends superclass { ); }; - getUserThreads = async (userId: string, teamId: string, before = '', after = '', pageSize = PER_PAGE_DEFAULT, extended = false, deleted = false, unread = false, since = 0) => { + getUserThreads = async (userId: string, teamId: string, before = '', after = '', perPage = PER_PAGE_DEFAULT, extended = false, deleted = false, unread = false, since = 0) => { + const serverVersion = this.getServerVersion(); + let queryStringObj; + if (isMinimumServerVersion(serverVersion, 6, 0)) { + queryStringObj = {before, after, per_page: perPage, extended, deleted, unread, since}; + } else { + queryStringObj = {before, after, pageSize: perPage, extended, deleted, unread, since}; + } return this.doFetch( - `${this.getUserThreadsRoute(userId, teamId)}${buildQueryString({before, after, pageSize, extended, deleted, unread, since})}`, + `${this.getUserThreadsRoute(userId, teamId)}${buildQueryString(queryStringObj)}`, {method: 'get'}, ); };