diff options
| author | Neil Alexander <neilalexander@users.noreply.github.com> | 2020-05-01 10:48:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-01 10:48:17 +0100 |
| commit | e15f6676ac3f76ec2ef679c2df300d6a8e7e668f (patch) | |
| tree | 0b82339939e8932d46e1ca2cf6024ab55dc7602f /federationapi/routing/events.go | |
| parent | ebbfc125920beb321713e28a2a137d768406fa15 (diff) | |
Consolidation of roomserver APIs (#994)
* Consolidation of roomserver APIs
* Comment out alias tests for now, they are broken
* Wire AS API into roomserver again
* Roomserver didn't take asAPI param before so return to that
* Prevent roomserver asking AS API for alias info
* Rename some files
* Remove alias_test, incoherent tests and unwanted appservice integration
* Remove FS API inject on syncapi component
Diffstat (limited to 'federationapi/routing/events.go')
| -rw-r--r-- | federationapi/routing/events.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/federationapi/routing/events.go b/federationapi/routing/events.go index 03492db4..ced9e3d5 100644 --- a/federationapi/routing/events.go +++ b/federationapi/routing/events.go @@ -29,11 +29,11 @@ import ( func GetEvent( ctx context.Context, request *gomatrixserverlib.FederationRequest, - query api.RoomserverQueryAPI, + rsAPI api.RoomserverInternalAPI, eventID string, origin gomatrixserverlib.ServerName, ) util.JSONResponse { - event, err := getEvent(ctx, request, query, eventID) + event, err := getEvent(ctx, request, rsAPI, eventID) if err != nil { return *err } @@ -52,11 +52,11 @@ func GetEvent( func getEvent( ctx context.Context, request *gomatrixserverlib.FederationRequest, - query api.RoomserverQueryAPI, + rsAPI api.RoomserverInternalAPI, eventID string, ) (*gomatrixserverlib.Event, *util.JSONResponse) { var authResponse api.QueryServerAllowedToSeeEventResponse - err := query.QueryServerAllowedToSeeEvent( + err := rsAPI.QueryServerAllowedToSeeEvent( ctx, &api.QueryServerAllowedToSeeEventRequest{ EventID: eventID, @@ -75,7 +75,7 @@ func getEvent( } var eventsResponse api.QueryEventsByIDResponse - err = query.QueryEventsByID( + err = rsAPI.QueryEventsByID( ctx, &api.QueryEventsByIDRequest{EventIDs: []string{eventID}}, &eventsResponse, |