diff options
| author | kegsay <kegan@matrix.org> | 2023-04-27 12:54:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-27 12:54:20 +0100 |
| commit | b189edf4f43ff34b69d6c60aeb0efb60dd549c86 (patch) | |
| tree | 4c08aeda694f3e1cf17c66cf0e4b2b306af6a8df /federationapi/consumers | |
| parent | 2475cf4b61747e76a524af6f71a4eb7e112812af (diff) | |
Remove gmsl.HeaderedEvent (#3068)
Replaced with types.HeaderedEvent _for now_. In reality we want to move
them all to gmsl.Event and only use HeaderedEvent when we _need_ to
bundle the version/event ID with the event (seriailsation boundaries,
and even then only when we don't have the room version).
Requires https://github.com/matrix-org/gomatrixserverlib/pull/373
Diffstat (limited to 'federationapi/consumers')
| -rw-r--r-- | federationapi/consumers/roomserver.go | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/federationapi/consumers/roomserver.go b/federationapi/consumers/roomserver.go index 5ef65ee5..d0aa0640 100644 --- a/federationapi/consumers/roomserver.go +++ b/federationapi/consumers/roomserver.go @@ -187,7 +187,12 @@ func (s *OutputRoomEventConsumer) processMessage(ore api.OutputNewRoomEvent, rew addsStateEvents = append(addsStateEvents, eventsRes.Events...) } - addsJoinedHosts, err := JoinedHostsFromEvents(gomatrixserverlib.UnwrapEventHeaders(addsStateEvents)) + evs := make([]*gomatrixserverlib.Event, len(addsStateEvents)) + for i := range evs { + evs[i] = addsStateEvents[i].Event + } + + addsJoinedHosts, err := JoinedHostsFromEvents(evs) if err != nil { return err } |