Merge branch 'master' of github.com:mattermost/mattermost-server into MM-47853-true-up-review-telemetry-off-non-air-gapped

model/client4.go

@@ -8213,6 +8213,19 @@ func (c *Client4) GetCloudCustomer() (*CloudCustomer, *Response, error) {
 	return cloudCustomer, BuildResponse(r), nil
 }
 
+func (c *Client4) GetExpandStats(licenseId string) (*SubscriptionExpandStatus, *Response, error) {
+	r, err := c.DoAPIGet(fmt.Sprintf("%s%s?licenseID=%s", c.cloudRoute(), "/subscription/expand", licenseId), "")
+	if err != nil {
+		return nil, BuildResponse(r), err
+	}
+	defer closeBody(r)
+
+	var subscriptionExpandable *SubscriptionExpandStatus
+	json.NewDecoder(r.Body).Decode(&subscriptionExpandable)
+
+	return subscriptionExpandable, BuildResponse(r), nil
+}
+
 func (c *Client4) GetSubscription() (*Subscription, *Response, error) {
 	r, err := c.DoAPIGet(c.cloudRoute()+"/subscription", "")
 	if err != nil {

model/cloud.go

@@ -124,6 +124,10 @@ type ValidateBusinessEmailResponse struct {
 	IsValid bool `json:"is_valid"`
 }
 
+type SubscriptionExpandStatus struct {
+	IsExpandable bool `json:"is_expandable"`
+}
+
 // CloudCustomerInfo represents editable info of a customer.
 type CloudCustomerInfo struct {
 	Name                  string `json:"name"`

model/post.go

@@ -333,13 +333,16 @@ type GetPostsOptions struct {
 
 type PostCountOptions struct {
 	// Only include posts on a specific team. "" for any team.
-	TeamId          string
-	MustHaveFile    bool
-	MustHaveHashtag bool
-	ExcludeDeleted  bool
-	UsersPostsOnly  bool
+	TeamId             string
+	MustHaveFile       bool
+	MustHaveHashtag    bool
+	ExcludeDeleted     bool
+	ExcludeSystemPosts bool
+	UsersPostsOnly     bool
 	// AllowFromCache looks up cache only when ExcludeDeleted and UsersPostsOnly are true and rest are falsy.
 	AllowFromCache bool
+	SincePostID    string
+	SinceUpdateAt  int64
 }
 
 func (o *Post) Etag() string {