From e9a9262956bb948532e3d21604059f23cab85066 Mon Sep 17 00:00:00 2001 From: Joram Wilander Date: Thu, 18 Jan 2018 11:52:16 -0500 Subject: Handle missed case with ExperimentalEnableDefaultChannelLeaveJoinMessages setting (#8112) --- app/team.go | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'app/team.go') 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) + } } } -- cgit v1.2.3-1-g7c22