From f5b3144dc33ddcb2ab161323d422cab257d04b4c Mon Sep 17 00:00:00 2001
From: kegsay <kegan@matrix.org>
Date: Tue, 2 May 2023 15:03:16 +0100
Subject: Use PDU not *Event in HeaderedEvent (#3073)
Requires https://github.com/matrix-org/gomatrixserverlib/pull/376
This has numerous upsides:
- Less type casting to `*Event` is required.
- Making Dendrite work with `PDU` interfaces means we can swap out Event
impls more easily.
- Tests which represent weird event shapes are easier to write.
Part of a series of refactors on GMSL.
---
federationapi/routing/leave.go | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
(limited to 'federationapi/routing/leave.go')
diff --git a/federationapi/routing/leave.go b/federationapi/routing/leave.go
index c9b13b98..da677d5d 100644
--- a/federationapi/routing/leave.go
+++ b/federationapi/routing/leave.go
@@ -110,12 +110,12 @@ func MakeLeave(
}
// Check that the leave is allowed or not
- stateEvents := make([]*gomatrixserverlib.Event, len(queryRes.StateEvents))
+ stateEvents := make([]gomatrixserverlib.PDU, len(queryRes.StateEvents))
for i := range queryRes.StateEvents {
- stateEvents[i] = queryRes.StateEvents[i].Event
+ stateEvents[i] = queryRes.StateEvents[i].PDU
}
- provider := gomatrixserverlib.NewAuthEvents(gomatrixserverlib.ToPDUs(stateEvents))
- if err = gomatrixserverlib.Allowed(event.Event, &provider); err != nil {
+ provider := gomatrixserverlib.NewAuthEvents(stateEvents)
+ if err = gomatrixserverlib.Allowed(event, &provider); err != nil {
return util.JSONResponse{
Code: http.StatusForbidden,
JSON: jsonerror.Forbidden(err.Error()),
@@ -313,7 +313,7 @@ func SendLeave(
InputRoomEvents: []api.InputRoomEvent{
{
Kind: api.KindNew,
- Event: &types.HeaderedEvent{Event: event},
+ Event: &types.HeaderedEvent{PDU: event},
SendAsServer: string(cfg.Matrix.ServerName),
TransactionID: nil,
},
--
cgit v1.2.3