From 3539a9a60b24bd9c0c1360b17c8fe3e6ebf8cf3c Mon Sep 17 00:00:00 2001
From: Daniel Schalla <daniel@schalla.me>
Date: Fri, 20 Jul 2018 23:00:58 +0200
Subject: Default Channel Functionality + Test Suite (#9068)

gofmt

Make skipping for non public channels default

Deduplication of Default Channels; Only post join to townsquare

Post join channel message for all custom default channels
---
 model/config.go | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'model/config.go')

diff --git a/model/config.go b/model/config.go
index d40851a9a..f24abfe83 100644
--- a/model/config.go
+++ b/model/config.go
@@ -1105,6 +1105,7 @@ type TeamSettings struct {
 	ExperimentalHideTownSquareinLHS     *bool
 	ExperimentalTownSquareIsReadOnly    *bool
 	ExperimentalPrimaryTeam             *string
+	ExperimentalDefaultChannels         []string
 }
 
 func (s *TeamSettings) SetDefaults() {
@@ -1217,6 +1218,10 @@ func (s *TeamSettings) SetDefaults() {
 		s.ExperimentalPrimaryTeam = NewString("")
 	}
 
+	if s.ExperimentalDefaultChannels == nil {
+		s.ExperimentalDefaultChannels = []string{}
+	}
+
 	if s.EnableTeamCreation == nil {
 		s.EnableTeamCreation = NewBool(true)
 	}
-- 
cgit v1.2.3-1-g7c22