lovely-projects/dendrite
lovely-projects/dendrite
1
0
Fork 0
mirror of https://github.com/element-hq/dendrite.git synced 2025-03-14 14:15:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Send event using the PDU, not just e. Add a log event so we can see when it is sent"

Browse source 
This reverts commit 4c55d5356f.
This commit is contained in:
Richard Carback 2024-12-03 14:57:51 +00:00
parent 8dd5e50ed1
commit 253d7a9599
1 changed files with 1 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
clientapi/routing/redaction.go
View file

@ -15,7 +15,6 @@ import (
"github.com/matrix-org/gomatrixserverlib"
"github.com/matrix-org/gomatrixserverlib/spec"
"github.com/matrix-org/util"
"github.com/sirupsen/logrus"
"github.com/element-hq/dendrite/clientapi/httputil"
"github.com/element-hq/dendrite/internal/eventutil"
@ -41,13 +40,6 @@ func SendRedaction(
txnID *string,
txnCache *transactions.Cache,
) util.JSONResponse {
roomVersion, err := rsAPI.QueryRoomVersionForRoom(req.Context(), roomID)
if err != nil {
return util.JSONResponse{
Code: http.StatusBadRequest,
JSON: spec.UnsupportedRoomVersion(err.Error()),
}
}
deviceUserID, userIDErr := spec.NewUserID(device.UserID, true)
if userIDErr != nil {
return util.JSONResponse{
@ -183,7 +175,7 @@ func SendRedaction(
}
}
domain := device.UserDomain()
if err = roomserverAPI.SendEvents(context.Background(), rsAPI, roomserverAPI.KindNew, []*types.HeaderedEvent{{PDU: e.PDU}}, device.UserDomain(), domain, domain, nil, false); err != nil {
if err = roomserverAPI.SendEvents(context.Background(), rsAPI, roomserverAPI.KindNew, []*types.HeaderedEvent{e}, device.UserDomain(), domain, domain, nil, false); err != nil {
util.GetLogger(req.Context()).WithError(err).Errorf("failed to SendEvents")
return util.JSONResponse{
Code: http.StatusInternalServerError,
@ -191,12 +183,6 @@ func SendRedaction(
}
}
util.GetLogger(req.Context()).WithFields(logrus.Fields{
"event_id": e.PDU.EventID(),
"room_id": roomID,
"room_version": roomVersion,
}).Info("Sent redaction to roomserver")
res := util.JSONResponse{
Code: 200,
JSON: redactionResponse{