[MM-54757] Stop broadcasting channel_deleted/channel_restored messages from private channels to non-members (#27001)

* [MM-54757] Stop broadcasting channel_deleted/channel_restored messages from private channels to non-members

* Remove unnecessary return

---------

Co-authored-by: Mattermost Build <build@mattermost.com>
Этот коммит содержится в:
Devin Binnie
2024-05-15 17:18:05 -04:00
коммит произвёл GitHub
родитель 30e3f8cdd7
Коммит 7e797cea3b
2 изменённых файлов: 116 добавлений и 3 удалений

Просмотреть файл

@@ -764,7 +764,12 @@ func (a *App) RestoreChannel(c request.CTX, channel *model.Channel, userID strin
channel.DeleteAt = 0
a.Srv().Platform().InvalidateCacheForChannel(channel)
message := model.NewWebSocketEvent(model.WebsocketEventChannelRestored, channel.TeamId, "", "", nil, "")
var message *model.WebSocketEvent
if channel.Type == model.ChannelTypeOpen {
message = model.NewWebSocketEvent(model.WebsocketEventChannelRestored, channel.TeamId, "", "", nil, "")
} else {
message = model.NewWebSocketEvent(model.WebsocketEventChannelRestored, "", channel.Id, "", nil, "")
}
message.Add("channel_id", channel.Id)
a.Publish(message)
@@ -1497,7 +1502,12 @@ func (a *App) DeleteChannel(c request.CTX, channel *model.Channel, userID string
a.Srv().Platform().InvalidateCacheForChannel(channel)
message := model.NewWebSocketEvent(model.WebsocketEventChannelDeleted, channel.TeamId, "", "", nil, "")
var message *model.WebSocketEvent
if channel.Type == model.ChannelTypeOpen {
message = model.NewWebSocketEvent(model.WebsocketEventChannelDeleted, channel.TeamId, "", "", nil, "")
} else {
message = model.NewWebSocketEvent(model.WebsocketEventChannelDeleted, "", channel.Id, "", nil, "")
}
message.Add("channel_id", channel.Id)
message.Add("delete_at", deleteAt)
a.Publish(message)
@@ -3078,8 +3088,13 @@ func (a *App) PermanentDeleteChannel(c request.CTX, channel *model.Channel) *mod
}
a.Srv().Platform().InvalidateCacheForChannel(channel)
message := model.NewWebSocketEvent(model.WebsocketEventChannelDeleted, channel.TeamId, "", "", nil, "")
var message *model.WebSocketEvent
if channel.Type == model.ChannelTypeOpen {
message = model.NewWebSocketEvent(model.WebsocketEventChannelDeleted, channel.TeamId, "", "", nil, "")
} else {
message = model.NewWebSocketEvent(model.WebsocketEventChannelDeleted, "", channel.Id, "", nil, "")
}
message.Add("channel_id", channel.Id)
message.Add("delete_at", deleteAt)
a.Publish(message)