From a71a9fc3bff1b6a6c9d5e0a65f53686922572834 Mon Sep 17 00:00:00 2001
From: Saturnino Abril <saturnino.abril@gmail.com>
Date: Tue, 14 Mar 2017 21:08:58 +0900
Subject: APIv4 DELETE channels/{channel_id} (#5723)

---
 app/channel.go | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'app')

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)
 
-- 
cgit v1.2.3-1-g7c22