mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-17 03:43:11 -06:00
Code Issues Packages Projects Releases Wiki Activity

Move function out of common and into gmsl

Browse source
This commit is contained in:
Neil Alexander 2020-03-27 15:01:53 +00:00
parent e0468e62a8
commit 4ac3e03db1
5 changed files with 7 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
common/events.go
View file

@ -124,12 +124,3 @@ func AddPrevEventsToEvent(
return nil return nil
} }
// RemoveEventHeaders unwraps an array of headered events.
func RemoveEventHeaders(in []gomatrixserverlib.HeaderedEvent) []gomatrixserverlib.Event {
result := make([]gomatrixserverlib.Event, len(in))
for i := range in {
result[i] = in[i].Event
}
return result
}

4
federationapi/routing/join.go
View file

@ -218,8 +218,8 @@ func SendJoin(
return util.JSONResponse{ return util.JSONResponse{
Code: http.StatusOK, Code: http.StatusOK,
JSON: map[string]interface{}{ JSON: map[string]interface{}{
"state": common.RemoveEventHeaders(stateAndAuthChainResponse.StateEvents), "state": gomatrixserverlib.UnwrapEventHeaders(stateAndAuthChainResponse.StateEvents),
"auth_chain": common.RemoveEventHeaders(stateAndAuthChainResponse.AuthChainEvents), "auth_chain": gomatrixserverlib.UnwrapEventHeaders(stateAndAuthChainResponse.AuthChainEvents),
}, },
} }
} }

5
federationapi/routing/state.go
View file

@ -18,7 +18,6 @@ import (
"net/url" "net/url"
"github.com/matrix-org/dendrite/clientapi/jsonerror" "github.com/matrix-org/dendrite/clientapi/jsonerror"
"github.com/matrix-org/dendrite/common"
"github.com/matrix-org/dendrite/roomserver/api" "github.com/matrix-org/dendrite/roomserver/api"
"github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib"
"github.com/matrix-org/util" "github.com/matrix-org/util"
@ -131,8 +130,8 @@ func getState(
} }
return &gomatrixserverlib.RespState{ return &gomatrixserverlib.RespState{
StateEvents: common.RemoveEventHeaders(response.StateEvents), StateEvents: gomatrixserverlib.UnwrapEventHeaders(response.StateEvents),
AuthEvents: common.RemoveEventHeaders(response.AuthChainEvents), AuthEvents: gomatrixserverlib.UnwrapEventHeaders(response.AuthChainEvents),
}, nil }, nil
} }

2
go.mod
View file

@ -9,7 +9,7 @@ require (
github.com/matrix-org/go-http-js-libp2p v0.0.0-20200318135427-31631a9ef51f github.com/matrix-org/go-http-js-libp2p v0.0.0-20200318135427-31631a9ef51f
github.com/matrix-org/go-sqlite3-js v0.0.0-20200304164012-aa524245b658 github.com/matrix-org/go-sqlite3-js v0.0.0-20200304164012-aa524245b658
github.com/matrix-org/gomatrix v0.0.0-20190528120928-7df988a63f26 github.com/matrix-org/gomatrix v0.0.0-20190528120928-7df988a63f26
github.com/matrix-org/gomatrixserverlib v0.0.0-20200327143012-be83dab84222 github.com/matrix-org/gomatrixserverlib v0.0.0-20200327150038-7c7eb457f1b4
github.com/matrix-org/naffka v0.0.0-20200127221512-0716baaabaf1 github.com/matrix-org/naffka v0.0.0-20200127221512-0716baaabaf1
github.com/matrix-org/util v0.0.0-20190711121626-527ce5ddefc7 github.com/matrix-org/util v0.0.0-20190711121626-527ce5ddefc7
github.com/mattn/go-sqlite3 v2.0.2+incompatible github.com/mattn/go-sqlite3 v2.0.2+incompatible

2
go.sum
View file

@ -170,6 +170,8 @@ github.com/matrix-org/gomatrixserverlib v0.0.0-20200327141825-4c04d7773f61 h1:9c
github.com/matrix-org/gomatrixserverlib v0.0.0-20200327141825-4c04d7773f61/go.mod h1:FsKa2pWE/bpQql9H7U4boOPXFoJX/QcqaZZ6ijLkaZI= github.com/matrix-org/gomatrixserverlib v0.0.0-20200327141825-4c04d7773f61/go.mod h1:FsKa2pWE/bpQql9H7U4boOPXFoJX/QcqaZZ6ijLkaZI=
github.com/matrix-org/gomatrixserverlib v0.0.0-20200327143012-be83dab84222 h1:b8u7o03EGemkblBgAvwtpCjVXKwzBZ794uCco/Urv6Y= github.com/matrix-org/gomatrixserverlib v0.0.0-20200327143012-be83dab84222 h1:b8u7o03EGemkblBgAvwtpCjVXKwzBZ794uCco/Urv6Y=
github.com/matrix-org/gomatrixserverlib v0.0.0-20200327143012-be83dab84222/go.mod h1:FsKa2pWE/bpQql9H7U4boOPXFoJX/QcqaZZ6ijLkaZI= github.com/matrix-org/gomatrixserverlib v0.0.0-20200327143012-be83dab84222/go.mod h1:FsKa2pWE/bpQql9H7U4boOPXFoJX/QcqaZZ6ijLkaZI=
github.com/matrix-org/gomatrixserverlib v0.0.0-20200327150038-7c7eb457f1b4 h1:lCdqy980ToVrW74kEZzxqeZIrXJ3rhBrfLPP4l/Vihs=
github.com/matrix-org/gomatrixserverlib v0.0.0-20200327150038-7c7eb457f1b4/go.mod h1:FsKa2pWE/bpQql9H7U4boOPXFoJX/QcqaZZ6ijLkaZI=
github.com/matrix-org/naffka v0.0.0-20200127221512-0716baaabaf1 h1:osLoFdOy+ChQqVUn2PeTDETFftVkl4w9t/OW18g3lnk= github.com/matrix-org/naffka v0.0.0-20200127221512-0716baaabaf1 h1:osLoFdOy+ChQqVUn2PeTDETFftVkl4w9t/OW18g3lnk=
github.com/matrix-org/naffka v0.0.0-20200127221512-0716baaabaf1/go.mod h1:cXoYQIENbdWIQHt1SyCo6Bl3C3raHwJ0wgVrXHSqf+A= github.com/matrix-org/naffka v0.0.0-20200127221512-0716baaabaf1/go.mod h1:cXoYQIENbdWIQHt1SyCo6Bl3C3raHwJ0wgVrXHSqf+A=
github.com/matrix-org/util v0.0.0-20171127121716-2e2df66af2f5 h1:W7l5CP4V7wPyPb4tYE11dbmeAOwtFQBTW0rf4OonOS8= github.com/matrix-org/util v0.0.0-20171127121716-2e2df66af2f5 h1:W7l5CP4V7wPyPb4tYE11dbmeAOwtFQBTW0rf4OonOS8=