diff options
| author | Neil Alexander <neilalexander@users.noreply.github.com> | 2020-04-29 11:34:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-29 11:34:31 +0100 |
| commit | a308e61331f549ae0964f83dff88abc282033ed3 (patch) | |
| tree | 7dad59cce409fd1f3e806d0b928b141a4fc7fcd5 /federationapi | |
| parent | a4b9edb28e32b505cf3a67bcba1acacd4a882155 (diff) | |
Federation sender API remodel (#988)
* Define an input API for the federationsender
* Wiring for rooomserver input API and federation sender input API
* Whoops, commit common too
* Merge input API into query API
* Rename FederationSenderQueryAPI to FederationSenderInternalAPI
* Fix dendritejs
* Rename Input to Perform
* Fix a couple of inputs -> performs
* Remove needless storage interface, add comments
Diffstat (limited to 'federationapi')
| -rw-r--r-- | federationapi/federationapi.go | 2 | ||||
| -rw-r--r-- | federationapi/routing/query.go | 2 | ||||
| -rw-r--r-- | federationapi/routing/routing.go | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/federationapi/federationapi.go b/federationapi/federationapi.go index ed96322b..72e2b54a 100644 --- a/federationapi/federationapi.go +++ b/federationapi/federationapi.go @@ -40,7 +40,7 @@ func SetupFederationAPIComponent( inputAPI roomserverAPI.RoomserverInputAPI, queryAPI roomserverAPI.RoomserverQueryAPI, asAPI appserviceAPI.AppServiceQueryAPI, - federationSenderAPI federationSenderAPI.FederationSenderQueryAPI, + federationSenderAPI federationSenderAPI.FederationSenderInternalAPI, eduProducer *producers.EDUServerProducer, ) { roomserverProducer := producers.NewRoomserverProducer(inputAPI, queryAPI) diff --git a/federationapi/routing/query.go b/federationapi/routing/query.go index 7cb50e52..13c92451 100644 --- a/federationapi/routing/query.go +++ b/federationapi/routing/query.go @@ -33,7 +33,7 @@ func RoomAliasToID( federation *gomatrixserverlib.FederationClient, cfg *config.Dendrite, aliasAPI roomserverAPI.RoomserverAliasAPI, - senderAPI federationSenderAPI.FederationSenderQueryAPI, + senderAPI federationSenderAPI.FederationSenderInternalAPI, ) util.JSONResponse { roomAlias := httpReq.FormValue("room_alias") if roomAlias == "" { diff --git a/federationapi/routing/routing.go b/federationapi/routing/routing.go index 83bac555..ebaeec6e 100644 --- a/federationapi/routing/routing.go +++ b/federationapi/routing/routing.go @@ -49,7 +49,7 @@ func Setup( asAPI appserviceAPI.AppServiceQueryAPI, producer *producers.RoomserverProducer, eduProducer *producers.EDUServerProducer, - federationSenderAPI federationSenderAPI.FederationSenderQueryAPI, + federationSenderAPI federationSenderAPI.FederationSenderInternalAPI, keys gomatrixserverlib.KeyRing, federation *gomatrixserverlib.FederationClient, accountDB accounts.Database, |