diff options
| author | kegsay <kegan@matrix.org> | 2022-02-09 20:31:24 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-09 20:31:24 +0000 |
| commit | aa5c3b88dea207410461820ee480b002d185aa54 (patch) | |
| tree | 7249679bd4c8d84f796dbd11198074dd98a0ee53 /federationapi/routing/join.go | |
| parent | cc688a9a386f48e38687a697b50f9be7d2b06fb0 (diff) | |
Unmarshal events at the Dendrite level not GMSL level (#2164)
* Use new event json types in gmsl
* Fix EventJSON to actually unmarshal events
* Update GMSL
* Bump GMSL and improve error messages
* Send back the correct RespState
* Update GMSL
Diffstat (limited to 'federationapi/routing/join.go')
| -rw-r--r-- | federationapi/routing/join.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/federationapi/routing/join.go b/federationapi/routing/join.go index 7f8d3150..495b8c91 100644 --- a/federationapi/routing/join.go +++ b/federationapi/routing/join.go @@ -351,8 +351,8 @@ func SendJoin( return util.JSONResponse{ Code: http.StatusOK, JSON: gomatrixserverlib.RespSendJoin{ - StateEvents: gomatrixserverlib.UnwrapEventHeaders(stateAndAuthChainResponse.StateEvents), - AuthEvents: gomatrixserverlib.UnwrapEventHeaders(stateAndAuthChainResponse.AuthChainEvents), + StateEvents: gomatrixserverlib.NewEventJSONsFromHeaderedEvents(stateAndAuthChainResponse.StateEvents), + AuthEvents: gomatrixserverlib.NewEventJSONsFromHeaderedEvents(stateAndAuthChainResponse.AuthChainEvents), Origin: cfg.Matrix.ServerName, }, } |