From 095e5d788b11f0f12077484c42ad3c6e17d09cbd Mon Sep 17 00:00:00 2001 From: Doug Lauder Date: Mon, 17 Aug 2020 08:20:04 -0400 Subject: [PATCH] MM-27868 fix panic when user joins teams (#15268) Server panics when user joins team and one of the default channels has been archived. This can be triggered by archiving "Off-Topic" or any of the channels listed in `TeamSettings.ExperimentalDefaultChannels`. --- app/channel.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/channel.go b/app/channel.go index 3810650376..d331dc1824 100644 --- a/app/channel.go +++ b/app/channel.go @@ -82,7 +82,7 @@ func (a *App) JoinDefaultChannels(teamId string, user *model.User, shouldBeAdmin case errors.As(err, &nfErr): err = model.NewAppError("JoinDefaultChannels", "app.channel.get_by_name.missing.app_error", nil, nfErr.Error(), http.StatusNotFound) default: - err = model.NewAppError("JoinDefaultChannels", "app.channel.get_by_name.existing.app_error", nil, err.Error(), http.StatusInternalServerError) + err = model.NewAppError("JoinDefaultChannels", "app.channel.get_by_name.existing.app_error", nil, channelErr.Error(), http.StatusInternalServerError) } continue }