diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2018-01-18 11:52:16 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-18 11:52:16 -0500 |
| commit | e9a9262956bb948532e3d21604059f23cab85066 (patch) | |
| tree | d69480bfc4599fd91b634b4ecf399bbe827b3906 /app/team.go | |
| parent | 4e6cc846a618ecef5c101727bbd03f6674044ab7 (diff) | |
| download | chat-e9a9262956bb948532e3d21604059f23cab85066.tar.gz chat-e9a9262956bb948532e3d21604059f23cab85066.tar.bz2 chat-e9a9262956bb948532e3d21604059f23cab85066.zip | |
Handle missed case with ExperimentalEnableDefaultChannelLeaveJoinMessages setting (#8112)
Diffstat (limited to 'app/team.go')
| -rw-r--r-- | app/team.go | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/app/team.go b/app/team.go index 00808b200..bda418081 100644 --- a/app/team.go +++ b/app/team.go @@ -616,13 +616,15 @@ func (a *App) LeaveTeam(team *model.Team, user *model.User, requestorId string) channel = result.Data.(*model.Channel) } - if requestorId == user.Id { - if err := a.postLeaveTeamMessage(user, channel); err != nil { - l4g.Error(utils.T("api.channel.post_user_add_remove_message_and_forget.error"), err) - } - } else { - if err := a.PostRemoveFromChannelMessage(user.Id, user, channel); err != nil { - l4g.Error(utils.T("api.channel.post_user_add_remove_message_and_forget.error"), err) + if *a.Config().ServiceSettings.ExperimentalEnableDefaultChannelLeaveJoinMessages { + if requestorId == user.Id { + if err := a.postLeaveTeamMessage(user, channel); err != nil { + l4g.Error(utils.T("api.channel.post_user_add_remove_message_and_forget.error"), err) + } + } else { + if err := a.PostRemoveFromChannelMessage(user.Id, user, channel); err != nil { + l4g.Error(utils.T("api.channel.post_user_add_remove_message_and_forget.error"), err) + } } } |