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