diff options
| author | Saturnino Abril <saturnino.abril@gmail.com> | 2017-03-14 21:08:58 +0900 |
|---|---|---|
| committer | George Goldberg <george@gberg.me> | 2017-03-14 12:08:58 +0000 |
| commit | a71a9fc3bff1b6a6c9d5e0a65f53686922572834 (patch) | |
| tree | c132dcdb82cef953634e091d91fddab1c3572efe /app | |
| parent | aafc63933a7e213261e28ac7f528cea50b70e1af (diff) | |
| download | chat-a71a9fc3bff1b6a6c9d5e0a65f53686922572834.tar.gz chat-a71a9fc3bff1b6a6c9d5e0a65f53686922572834.tar.bz2 chat-a71a9fc3bff1b6a6c9d5e0a65f53686922572834.zip | |
APIv4 DELETE channels/{channel_id} (#5723)
Diffstat (limited to 'app')
| -rw-r--r-- | app/channel.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/channel.go b/app/channel.go index 59b71c0a5..49d55e52f 100644 --- a/app/channel.go +++ b/app/channel.go @@ -703,6 +703,9 @@ func GetChannelCounts(teamId string, userId string) (*model.ChannelCounts, *mode } func JoinChannel(channel *model.Channel, userId string) *model.AppError { + if channel.DeleteAt > 0 { + return model.NewLocAppError("JoinChannel", "api.channel.join_channel.already_deleted.app_error", nil, "") + } userChan := Srv.Store.User().Get(userId) memberChan := Srv.Store.Channel().GetMember(channel.Id, userId) |