From da124f018dbb10a41f4d4b5ecb4818baf628e940 Mon Sep 17 00:00:00 2001
From: Chris Duarte <csduarte@users.noreply.github.com>
Date: Mon, 23 Jul 2018 08:18:24 -0700
Subject: Add ExperimentalSidebarPreference in the config (#9013)

* Add ExperimentalSidebarPreference in the config

* Override Sidebar preference based on GroupUnread settings

* Rename to ExperimentalChannelOrganization

* Add Sidebar config in diagnostics

* Fix diagnostics for experimental_channel_organization
---
 model/config.go | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'model/config.go')

diff --git a/model/config.go b/model/config.go
index f24abfe83..f36b321ec 100644
--- a/model/config.go
+++ b/model/config.go
@@ -233,6 +233,7 @@ type ServiceSettings struct {
 	EnableTutorial                                    *bool
 	ExperimentalEnableDefaultChannelLeaveJoinMessages *bool
 	ExperimentalGroupUnreadChannels                   *string
+	ExperimentalChannelOrganization                   *bool
 	ImageProxyType                                    *string
 	ImageProxyURL                                     *string
 	ImageProxyOptions                                 *string
@@ -478,6 +479,11 @@ func (s *ServiceSettings) SetDefaults() {
 		s.ExperimentalGroupUnreadChannels = NewString(GROUP_UNREAD_CHANNELS_DEFAULT_ON)
 	}
 
+	if s.ExperimentalChannelOrganization == nil {
+		experimentalUnreadEnabled := *s.ExperimentalGroupUnreadChannels != GROUP_UNREAD_CHANNELS_DISABLED
+		s.ExperimentalChannelOrganization = NewBool(experimentalUnreadEnabled)
+	}
+
 	if s.ImageProxyType == nil {
 		s.ImageProxyType = NewString("")
 	}
-- 
cgit v1.2.3-1-g7c22