hoernschen/dendrite
1
0
Fork 0
mirror of https://github.com/hoernschen/dendrite.git synced 2025-08-01 22:02:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Consolidation of roomserver APIs (#994)

Browse source 
* 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
This commit is contained in:
Neil Alexander 2020-05-01 10:48:17 +01:00 • committed by GitHub
parent ebbfc12592
commit e15f6676ac
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
72 changed files with 894 additions and 1170 deletions
Download patch file Download diff file Expand all files Collapse all files

14
federationapi/routing/state.go
View file

@ -27,7 +27,7 @@ import (
func GetState(
ctx context.Context,
request *gomatrixserverlib.FederationRequest,
query api.RoomserverQueryAPI,
rsAPI api.RoomserverInternalAPI,
roomID string,
) util.JSONResponse {
eventID, err := parseEventIDParam(request)
@ -35,7 +35,7 @@ func GetState(
return *err
}
state, err := getState(ctx, request, query, roomID, eventID)
state, err := getState(ctx, request, rsAPI, roomID, eventID)
if err != nil {
return *err
}
@ -47,7 +47,7 @@ func GetState(
func GetStateIDs(
ctx context.Context,
request *gomatrixserverlib.FederationRequest,
query api.RoomserverQueryAPI,
rsAPI api.RoomserverInternalAPI,
roomID string,
) util.JSONResponse {
eventID, err := parseEventIDParam(request)
@ -55,7 +55,7 @@ func GetStateIDs(
return *err
}
state, err := getState(ctx, request, query, roomID, eventID)
state, err := getState(ctx, request, rsAPI, roomID, eventID)
if err != nil {
return *err
}
@ -94,11 +94,11 @@ func parseEventIDParam(
func getState(
ctx context.Context,
request *gomatrixserverlib.FederationRequest,
query api.RoomserverQueryAPI,
rsAPI api.RoomserverInternalAPI,
roomID string,
eventID string,
) (*gomatrixserverlib.RespState, *util.JSONResponse) {
event, resErr := getEvent(ctx, request, query, eventID)
event, resErr := getEvent(ctx, request, rsAPI, eventID)
if resErr != nil {
return nil, resErr
}
@ -110,7 +110,7 @@ func getState(
authEventIDs := getIDsFromEventRef(event.AuthEvents())
var response api.QueryStateAndAuthChainResponse
err := query.QueryStateAndAuthChain(
err := rsAPI.QueryStateAndAuthChain(
ctx,
&api.QueryStateAndAuthChainRequest{
RoomID: roomID,