Adding paging to elasticsearch API. (#9425)

2 files changed, 6 insertions, 14 deletions

diff --git a/model/client4.go b/model/client4.go
index c95aaad0b..d9034385b 100644
--- a/model/client4.go
+++ b/model/client4.go
@@ -2168,17 +2168,6 @@ func (c *Client4) SearchPostsWithParams(teamId string, params *SearchParameter)
 	}
 }
 
-// SearchPosts returns any posts with matching terms string including deleted channels.
-func (c *Client4) SearchPostsIncludeDeletedChannels(teamId string, terms string, isOrSearch bool) (*PostList, *Response) {
-	requestBody := map[string]interface{}{"terms": terms, "is_or_search": isOrSearch}
-	if r, err := c.DoApiPost(c.GetTeamRoute(teamId)+"/posts/search?include_deleted_channels=true", StringInterfaceToJson(requestBody)); err != nil {
-		return nil, BuildErrorResponse(r, err)
-	} else {
-		defer closeBody(r)
-		return PostListFromJson(r.Body), BuildResponse(r)
-	}
-}
-
 // SearchPosts returns any posts with matching terms string, including .
 func (c *Client4) SearchPostsWithMatches(teamId string, terms string, isOrSearch bool) (*PostSearchResults, *Response) {
 	requestBody := map[string]interface{}{"terms": terms, "is_or_search": isOrSearch}
diff --git a/model/post.go b/model/post.go
index 1f89cb419..5d2438fc4 100644
--- a/model/post.go
+++ b/model/post.go
@@ -97,9 +97,12 @@ type PostPatch struct {
 }
 
 type SearchParameter struct {
-	Terms          *string `json:"terms"`
-	IsOrSearch     *bool   `json:"is_or_search"`
-	TimeZoneOffset *int    `json:"time_zone_offset"`
+	Terms                  *string `json:"terms"`
+	IsOrSearch             *bool   `json:"is_or_search"`
+	TimeZoneOffset         *int    `json:"time_zone_offset"`
+	Page                   *int    `json:"page"`
+	PerPage                *int    `json:"per_page"`
+	IncludeDeletedChannels *bool   `json:"include_deleted_channels"`
 }
 
 func (o *PostPatch) WithRewrittenImageURLs(f func(string) string) *PostPatch {