summaryrefslogtreecommitdiffstats
path: root/app/team.go
diff options
context:
space:
mode:
Diffstat (limited to 'app/team.go')
-rw-r--r--app/team.go16
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)
+ }
}
}