aboutsummaryrefslogtreecommitdiff
path: root/roomserver/api
diff options
context:
space:
mode:
authorkegsay <kegan@matrix.org>2023-05-02 15:03:16 +0100
committerGitHub <noreply@github.com>2023-05-02 15:03:16 +0100
commitf5b3144dc33ddcb2ab161323d422cab257d04b4c (patch)
tree07d3b03944d2529d96c29674a96c3e76a76ae3b9 /roomserver/api
parent696cbb70b8cc8d663f7bb7c7a5f25cd57ea6803e (diff)
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.
Diffstat (limited to 'roomserver/api')
-rw-r--r--roomserver/api/wrapper.go5
1 files changed, 2 insertions, 3 deletions
diff --git a/roomserver/api/wrapper.go b/roomserver/api/wrapper.go
index d4606622..fc26a474 100644
--- a/roomserver/api/wrapper.go
+++ b/roomserver/api/wrapper.go
@@ -55,8 +55,7 @@ func SendEventWithState(
state gomatrixserverlib.StateResponse, event *types.HeaderedEvent,
origin spec.ServerName, haveEventIDs map[string]bool, async bool,
) error {
- outliersPDU := gomatrixserverlib.LineariseStateResponse(event.Version(), state)
- outliers := gomatrixserverlib.TempCastToEvents(outliersPDU)
+ outliers := gomatrixserverlib.LineariseStateResponse(event.Version(), state)
ires := make([]InputRoomEvent, 0, len(outliers))
for _, outlier := range outliers {
if haveEventIDs[outlier.EventID()] {
@@ -64,7 +63,7 @@ func SendEventWithState(
}
ires = append(ires, InputRoomEvent{
Kind: KindOutlier,
- Event: &types.HeaderedEvent{Event: outlier},
+ Event: &types.HeaderedEvent{PDU: outlier},
Origin: origin,
})
}