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 /clientapi/threepid | |
| 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 'clientapi/threepid')
| -rw-r--r-- | clientapi/threepid/invites.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/clientapi/threepid/invites.go b/clientapi/threepid/invites.go index 34fa5415..21940575 100644 --- a/clientapi/threepid/invites.go +++ b/clientapi/threepid/invites.go @@ -27,6 +27,7 @@ import ( "github.com/matrix-org/dendrite/clientapi/auth/authtypes" "github.com/matrix-org/dendrite/internal/eventutil" "github.com/matrix-org/dendrite/roomserver/api" + "github.com/matrix-org/dendrite/roomserver/types" "github.com/matrix-org/dendrite/setup/config" userapi "github.com/matrix-org/dendrite/userapi/api" "github.com/matrix-org/gomatrixserverlib" @@ -367,8 +368,8 @@ func emit3PIDInviteEvent( return api.SendEvents( ctx, rsAPI, api.KindNew, - []*gomatrixserverlib.HeaderedEvent{ - event.Headered(queryRes.RoomVersion), + []*types.HeaderedEvent{ + event, }, device.UserDomain(), cfg.Matrix.ServerName, |