diff options
| author | Siyuan Liu <liusy182@hotmail.com> | 2017-12-14 02:50:07 +0800 |
|---|---|---|
| committer | Chris <ccbrown112@gmail.com> | 2017-12-13 12:50:07 -0600 |
| commit | c39788b64b2d2c1f61968da234cac47c21e1affb (patch) | |
| tree | b7381e0df7c4af0adfafde37bd00b9206d40f93e /app/channel.go | |
| parent | ab30c4daf935d33b7e6088d82eb7c49dc2717918 (diff) | |
| download | chat-c39788b64b2d2c1f61968da234cac47c21e1affb.tar.gz chat-c39788b64b2d2c1f61968da234cac47c21e1affb.tar.bz2 chat-c39788b64b2d2c1f61968da234cac47c21e1affb.zip | |
Do not auto-join 'off-topic' channel if it is private (#7950)
Diffstat (limited to 'app/channel.go')
| -rw-r--r-- | app/channel.go | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/channel.go b/app/channel.go index 4dc1f349f..d37f681bb 100644 --- a/app/channel.go +++ b/app/channel.go @@ -78,8 +78,7 @@ func (a *App) JoinDefaultChannels(teamId string, user *model.User, channelRole s if result := <-a.Srv.Store.Channel().GetByName(teamId, "off-topic", true); result.Err != nil { err = result.Err - } else { - offTopic := result.Data.(*model.Channel) + } else if offTopic := result.Data.(*model.Channel); offTopic.Type == model.CHANNEL_OPEN { cm := &model.ChannelMember{ ChannelId: offTopic.Id, |