MM-32655 - Collapsed threads websocket handling (#16909)

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

model/client4.go

@@ -5966,14 +5966,16 @@ func (c *Client4) UpdateThreadsReadForUser(userId, teamId string) *Response {
 	return BuildResponse(r)
 }
 
-func (c *Client4) UpdateThreadReadForUser(userId, teamId, threadId string, timestamp int64) *Response {
+func (c *Client4) UpdateThreadReadForUser(userId, teamId, threadId string, timestamp int64) (*ThreadResponse, *Response) {
 	r, appErr := c.DoApiPut(fmt.Sprintf("%s/read/%d", c.GetUserThreadRoute(userId, teamId, threadId), timestamp), "")
 	if appErr != nil {
-		return BuildErrorResponse(r, appErr)
+		return nil, BuildErrorResponse(r, appErr)
 	}
 	defer closeBody(r)
+	var thread ThreadResponse
+	json.NewDecoder(r.Body).Decode(&thread)
 
-	return BuildResponse(r)
+	return &thread, BuildResponse(r)
 }
 
 func (c *Client4) UpdateThreadFollowForUser(userId, teamId, threadId string, state bool) *Response {

model/preference.go

@@ -13,17 +13,16 @@ import (
 )
 
 const (
-	PREFERENCE_CATEGORY_DIRECT_CHANNEL_SHOW        = "direct_channel_show"
-	PREFERENCE_CATEGORY_GROUP_CHANNEL_SHOW         = "group_channel_show"
-	PREFERENCE_CATEGORY_TUTORIAL_STEPS             = "tutorial_step"
-	PREFERENCE_CATEGORY_ADVANCED_SETTINGS          = "advanced_settings"
-	PREFERENCE_CATEGORY_FLAGGED_POST               = "flagged_post"
-	PREFERENCE_CATEGORY_FAVORITE_CHANNEL           = "favorite_channel"
-	PREFERENCE_CATEGORY_SIDEBAR_SETTINGS           = "sidebar_settings"
-	PREFERENCE_CATEGORY_COLLAPSED_THREADS_SETTINGS = "collapsed_threads_settings"
+	PREFERENCE_CATEGORY_DIRECT_CHANNEL_SHOW = "direct_channel_show"
+	PREFERENCE_CATEGORY_GROUP_CHANNEL_SHOW  = "group_channel_show"
+	PREFERENCE_CATEGORY_TUTORIAL_STEPS      = "tutorial_step"
+	PREFERENCE_CATEGORY_ADVANCED_SETTINGS   = "advanced_settings"
+	PREFERENCE_CATEGORY_FLAGGED_POST        = "flagged_post"
+	PREFERENCE_CATEGORY_FAVORITE_CHANNEL    = "favorite_channel"
+	PREFERENCE_CATEGORY_SIDEBAR_SETTINGS    = "sidebar_settings"
 
 	PREFERENCE_CATEGORY_DISPLAY_SETTINGS      = "display_settings"
-	PREFERENCE_NAME_COLLAPSED_THREADS_ENABLED = "collapsed_threads_enabled"
+	PREFERENCE_NAME_COLLAPSED_THREADS_ENABLED = "collapsed_reply_threads"
 	PREFERENCE_NAME_CHANNEL_DISPLAY_MODE      = "channel_display_mode"
 	PREFERENCE_NAME_COLLAPSE_SETTING          = "collapse_previews"
 	PREFERENCE_NAME_MESSAGE_DISPLAY           = "message_display"

model/thread.go

@@ -61,6 +61,12 @@ func (o *ThreadResponse) ToJson() string {
 	return string(b)
 }
 
+func ThreadResponseFromJson(s string) (*ThreadResponse, error) {
+	var t ThreadResponse
+	err := json.Unmarshal([]byte(s), &t)
+	return &t, err
+}
+
 func (o *Threads) ToJson() string {
 	b, _ := json.Marshal(o)
 	return string(b)