MM-33708 - Add MentionCountRoot column to ChannelMembers (#17099)

* added new column for root-only mentions

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>

model/channel_member.go

@@ -24,39 +24,42 @@ const (
 )
 
 type ChannelUnread struct {
-	TeamId       string    `json:"team_id"`
-	ChannelId    string    `json:"channel_id"`
-	MsgCount     int64     `json:"msg_count"`
-	MsgCountRoot int64     `json:"msg_count_root"`
-	MentionCount int64     `json:"mention_count"`
-	NotifyProps  StringMap `json:"-"`
+	TeamId           string    `json:"team_id"`
+	ChannelId        string    `json:"channel_id"`
+	MsgCount         int64     `json:"msg_count"`
+	MentionCount     int64     `json:"mention_count"`
+	MentionCountRoot int64     `json:"mention_count_root"`
+	MsgCountRoot     int64     `json:"msg_count_root"`
+	NotifyProps      StringMap `json:"-"`
 }
 
 type ChannelUnreadAt struct {
-	TeamId       string    `json:"team_id"`
-	UserId       string    `json:"user_id"`
-	ChannelId    string    `json:"channel_id"`
-	MsgCount     int64     `json:"msg_count"`
-	MsgCountRoot int64     `json:"msg_count_root"`
-	MentionCount int64     `json:"mention_count"`
-	LastViewedAt int64     `json:"last_viewed_at"`
-	NotifyProps  StringMap `json:"-"`
+	TeamId           string    `json:"team_id"`
+	UserId           string    `json:"user_id"`
+	ChannelId        string    `json:"channel_id"`
+	MsgCount         int64     `json:"msg_count"`
+	MentionCount     int64     `json:"mention_count"`
+	MentionCountRoot int64     `json:"mention_count_root"`
+	MsgCountRoot     int64     `json:"msg_count_root"`
+	LastViewedAt     int64     `json:"last_viewed_at"`
+	NotifyProps      StringMap `json:"-"`
 }
 
 type ChannelMember struct {
-	ChannelId     string    `json:"channel_id"`
-	UserId        string    `json:"user_id"`
-	Roles         string    `json:"roles"`
-	LastViewedAt  int64     `json:"last_viewed_at"`
-	MsgCount      int64     `json:"msg_count"`
-	MentionCount  int64     `json:"mention_count"`
-	NotifyProps   StringMap `json:"notify_props"`
-	LastUpdateAt  int64     `json:"last_update_at"`
-	SchemeGuest   bool      `json:"scheme_guest"`
-	SchemeUser    bool      `json:"scheme_user"`
-	SchemeAdmin   bool      `json:"scheme_admin"`
-	ExplicitRoles string    `json:"explicit_roles"`
-	MsgCountRoot  int64     `json:"msg_count_root"`
+	ChannelId        string    `json:"channel_id"`
+	UserId           string    `json:"user_id"`
+	Roles            string    `json:"roles"`
+	LastViewedAt     int64     `json:"last_viewed_at"`
+	MsgCount         int64     `json:"msg_count"`
+	MentionCount     int64     `json:"mention_count"`
+	MentionCountRoot int64     `json:"mention_count_root"`
+	MsgCountRoot     int64     `json:"msg_count_root"`
+	NotifyProps      StringMap `json:"notify_props"`
+	LastUpdateAt     int64     `json:"last_update_at"`
+	SchemeGuest      bool      `json:"scheme_guest"`
+	SchemeUser       bool      `json:"scheme_user"`
+	SchemeAdmin      bool      `json:"scheme_admin"`
+	ExplicitRoles    string    `json:"explicit_roles"`
 }
 
 type ChannelMembers []ChannelMember

model/client4.go

@@ -5885,20 +5885,6 @@ func (c *Client4) DownloadExport(name string, wr io.Writer, offset int64) (int64
 	return n, BuildResponse(r)
 }
 
-func (c *Client4) GetThreadMentionsForUserPerChannel(userId, teamId string) (map[string]int64, *Response) {
-	url := c.GetUserThreadsRoute(userId, teamId)
-	r, appErr := c.DoApiGet(url+"/mention_counts", "")
-	if appErr != nil {
-		return nil, BuildErrorResponse(r, appErr)
-	}
-	defer closeBody(r)
-
-	var counts map[string]int64
-	json.NewDecoder(r.Body).Decode(&counts)
-
-	return counts, BuildResponse(r)
-}
-
 func (c *Client4) GetUserThreads(userId, teamId string, options GetUserThreadsOpts) (*Threads, *Response) {
 	v := url.Values{}
 	if options.Since != 0 {

model/team_member.go

@@ -31,10 +31,11 @@ type TeamMember struct {
 
 //msgp:ignore TeamUnread
 type TeamUnread struct {
-	TeamId       string `json:"team_id"`
-	MsgCount     int64  `json:"msg_count"`
-	MsgCountRoot int64  `json:"msg_count_root"`
-	MentionCount int64  `json:"mention_count"`
+	TeamId           string `json:"team_id"`
+	MsgCount         int64  `json:"msg_count"`
+	MentionCount     int64  `json:"mention_count"`
+	MentionCountRoot int64  `json:"mention_count_root"`
+	MsgCountRoot     int64  `json:"msg_count_root"`
 }
 
 //msgp:ignore TeamMemberForExport