upstream/mattermost
1
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2026-05-28 04:35:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fixed WS payload for post burn event (#34936)

Browse source 
* Handled WS payload

* increased WS faliure timeout to elliminate flakiness

* lint fix

---------

Co-authored-by: Mattermost Build <build@mattermost.com>
This commit is contained in:
Harshil Sharma 2026-01-27 11:57:06 +05:30 committed by GitHub
parent 8ff88242a9
commit c6b205f0d7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 57 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
server/channels/app/post.go
View file

@ -2956,18 +2956,20 @@ func (a *App) PermanentDeletePost(rctx request.CTX, postID, deleteByID string) *
return model.NewAppError("DeletePost", "app.post.get.app_error", nil, "", http.StatusBadRequest).Wrap(err)
}
postHasFiles := len(post.FileIds) > 0
// If the post is a burn-on-read post, we should get the original post contents
if post.Type == model.PostTypeBurnOnRead {
tmpPost, appErr := a.getBurnOnReadPost(rctx, post)
revealedPost, appErr := a.getBurnOnReadPost(rctx, post)
if appErr != nil {
rctx.Logger().Warn("Failed to get burn-on-read post", mlog.Err(appErr))
}
if tmpPost != nil {
post = tmpPost
if revealedPost != nil {
postHasFiles = len(revealedPost.FileIds) > 0
}
}
if len(post.FileIds) > 0 {
if postHasFiles {
appErr := a.PermanentDeleteFilesByPost(rctx, post.Id)
if appErr != nil {
return appErr

51
server/channels/app/post_test.go
View file

@ -4,6 +4,7 @@
package app
import (
"encoding/json"
"errors"
"fmt"
"net/http"
@ -4475,6 +4476,56 @@ func TestPermanentDeletePost(t *testing.T) {
assert.Error(t, tmpErr)
assert.True(t, store.IsErrNotFound(tmpErr))
})
t.Run("should send unrevealed post in websocket broadcast", func(t *testing.T) {
// Enable feature with license
th.App.Srv().SetLicense(model.NewTestLicenseSKU(model.LicenseShortSkuEnterpriseAdvanced))
th.App.UpdateConfig(func(cfg *model.Config) {
cfg.ServiceSettings.EnableBurnOnRead = model.NewPointer(true)
})
// Create a burn-on-read post
//teamID := th.BasicTeam.Id
channelID := th.BasicChannel.Id
userID := th.BasicUser.Id
wsMessages, closeWS := connectFakeWebSocket(t, th, userID, "", []model.WebsocketEventType{model.WebsocketEventPostDeleted})
defer closeWS()
post := &model.Post{
Message: "burn on read message with file",
ChannelId: channelID,
PendingPostId: model.NewId() + ":" + fmt.Sprint(model.GetMillis()),
UserId: userID,
CreateAt: 0,
Type: model.PostTypeBurnOnRead,
}
post.AddProp(model.PostPropsExpireAt, model.GetMillis()+int64(model.DefaultExpirySeconds*1000))
post, _, appErr := th.App.CreatePost(th.Context, post, th.BasicChannel, model.CreatePostFlags{SetOnline: true})
require.Nil(t, appErr)
require.Equal(t, model.PostTypeBurnOnRead, post.Type)
appErr = th.App.PermanentDeletePost(th.Context, post.Id, userID)
require.Nil(t, appErr)
var received *model.WebSocketEvent
select {
case received = <-wsMessages:
// the post sent in websocket payload shouldn't contain message or file IDs
data := received.GetData()
postJSON, ok := data["post"].(string)
require.True(t, ok)
var receivedPost model.Post
err := json.Unmarshal([]byte(postJSON), &receivedPost)
require.NoError(t, err)
require.Equal(t, post.Id, receivedPost.Id)
require.Equal(t, "", receivedPost.Message)
require.Equal(t, 0, len(receivedPost.FileIds))
case <-time.After(10 * time.Second):
require.Fail(t, "Did not receive websocket message in time")
}
})
}
func TestSendTestMessage(t *testing.T) {