diff options
| author | Corey Hulen <corey@hulen.com> | 2016-07-11 04:37:20 -0800 |
|---|---|---|
| committer | Harrison Healey <harrisonmhealey@gmail.com> | 2016-07-11 08:37:20 -0400 |
| commit | dd9925227870525339eb5c6ae7ab3be2a21ab923 (patch) | |
| tree | c0a157292443c554c23f04342be45d6cc7b70cdc /api/channel.go | |
| parent | ab831b88de3b9e8dafb39bebda43faa29ffc8475 (diff) | |
| download | chat-dd9925227870525339eb5c6ae7ab3be2a21ab923.tar.gz chat-dd9925227870525339eb5c6ae7ab3be2a21ab923.tar.bz2 chat-dd9925227870525339eb5c6ae7ab3be2a21ab923.zip | |
PLT-3560 blocking adding to channel once user is removed (#3537)
Diffstat (limited to 'api/channel.go')
| -rw-r--r-- | api/channel.go | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/api/channel.go b/api/channel.go index 038a4286a..2e4eb2bb5 100644 --- a/api/channel.go +++ b/api/channel.go @@ -562,6 +562,11 @@ func AddUserToChannel(user *model.User, channel *model.Channel) (*model.ChannelM if result := <-tmchan; result.Err != nil { return nil, result.Err + } else { + teamMember := result.Data.(model.TeamMember) + if teamMember.DeleteAt > 0 { + return nil, model.NewLocAppError("AddUserToChannel", "api.channel.add_user.to.channel.failed.deleted.app_error", nil, "") + } } if result := <-cmchan; result.Err != nil { |