diff options
| -rw-r--r-- | app/channel.go | 2 | ||||
| -rw-r--r-- | app/team.go | 16 |
2 files changed, 10 insertions, 8 deletions
diff --git a/app/channel.go b/app/channel.go index 4b6a99d63..4d7eb7ef3 100644 --- a/app/channel.go +++ b/app/channel.go @@ -63,7 +63,7 @@ func (a *App) JoinDefaultChannels(teamId string, user *model.User, channelRole s l4g.Warn("Failed to update ChannelMemberHistory table %v", result.Err) } - if *a.Config().ServiceSettings.ExperimentalEnableDefaultChannelLeaveJoinMessages == true { + if *a.Config().ServiceSettings.ExperimentalEnableDefaultChannelLeaveJoinMessages { if requestor == nil { if err := a.postJoinTeamMessage(user, townSquare); err != nil { l4g.Error(utils.T("api.channel.post_user_add_remove_message_and_forget.error"), err) 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) + } } } |