From 90c0479c2f4c0d69371d76a77e157414f8cfcbc8 Mon Sep 17 00:00:00 2001
From: Allen Lai <allenplai@gmail.com>
Date: Thu, 23 Jan 2020 09:49:49 -0800
Subject: [PATCH] [MM-20804] Add "Unarchive Channel" option to the channel info
 screen - Additional fixes (#13614)

Automatic Merge
---
 app/channel.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/channel.go b/app/channel.go
index 243058bb7e..0841550c14 100644
--- a/app/channel.go
+++ b/app/channel.go
@@ -620,6 +620,7 @@ func (a *App) RestoreChannel(channel *model.Channel, userId string) (*model.Chan
 	if err := a.Srv.Store.Channel().Restore(channel.Id, model.GetMillis()); err != nil {
 		return nil, err
 	}
+	channel.DeleteAt = 0
 	a.InvalidateCacheForChannel(channel)
 
 	message := model.NewWebSocketEvent(model.WEBSOCKET_EVENT_CHANNEL_RESTORED, channel.TeamId, "", "", nil)
@@ -639,6 +640,9 @@ func (a *App) RestoreChannel(channel *model.Channel, userId string) (*model.Chan
 			Message:   T("api.channel.restore_channel.unarchived", map[string]interface{}{"Username": user.Username}),
 			Type:      model.POST_CHANNEL_RESTORED,
 			UserId:    userId,
+			Props: model.StringInterface{
+				"username": user.Username,
+			},
 		}
 
 		if _, err := a.CreatePost(post, channel, false); err != nil {