diff options
| author | kegsay <kegan@matrix.org> | 2022-05-05 13:17:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-05 13:17:38 +0100 |
| commit | 506de4bb3d69fef27e60d09d06712a72e588a198 (patch) | |
| tree | c2e7c0fd25b047cde8e597f9e675ba45a0fe5bab /appservice | |
| parent | d9e71b93b68efb57582d02448883b8a1259205e8 (diff) | |
Define component interfaces based on consumers (1/2) (#2423)
* Specify interfaces used by appservice, do half of clientapi
* convert more deps of clientapi to finer-grained interfaces
* Convert mediaapi and rest of clientapi
* Somehow this got missed
Diffstat (limited to 'appservice')
| -rw-r--r-- | appservice/api/query.go | 2 | ||||
| -rw-r--r-- | appservice/appservice.go | 6 | ||||
| -rw-r--r-- | appservice/consumers/roomserver.go | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/appservice/api/query.go b/appservice/api/query.go index cf25a961..6db8be85 100644 --- a/appservice/api/query.go +++ b/appservice/api/query.go @@ -84,7 +84,7 @@ func RetrieveUserProfile( ctx context.Context, userID string, asAPI AppServiceQueryAPI, - profileAPI userapi.UserProfileAPI, + profileAPI userapi.ClientUserAPI, ) (*authtypes.Profile, error) { localpart, _, err := gomatrixserverlib.SplitID('@', userID) if err != nil { diff --git a/appservice/appservice.go b/appservice/appservice.go index ac4ed967..e026a787 100644 --- a/appservice/appservice.go +++ b/appservice/appservice.go @@ -46,8 +46,8 @@ func AddInternalRoutes(router *mux.Router, queryAPI appserviceAPI.AppServiceQuer // can call functions directly on the returned API or via an HTTP interface using AddInternalRoutes. func NewInternalAPI( base *base.BaseDendrite, - userAPI userapi.UserInternalAPI, - rsAPI roomserverAPI.RoomserverInternalAPI, + userAPI userapi.AppserviceUserAPI, + rsAPI roomserverAPI.AppserviceRoomserverAPI, ) appserviceAPI.AppServiceQueryAPI { client := gomatrixserverlib.NewClient( gomatrixserverlib.WithTimeout(time.Second*30), @@ -113,7 +113,7 @@ func NewInternalAPI( // `sender_localpart` field of each application service if it doesn't // exist already func generateAppServiceAccount( - userAPI userapi.UserInternalAPI, + userAPI userapi.AppserviceUserAPI, as config.ApplicationService, ) error { var accRes userapi.PerformAccountCreationResponse diff --git a/appservice/consumers/roomserver.go b/appservice/consumers/roomserver.go index 31e05caa..e406e88a 100644 --- a/appservice/consumers/roomserver.go +++ b/appservice/consumers/roomserver.go @@ -37,7 +37,7 @@ type OutputRoomEventConsumer struct { durable string topic string asDB storage.Database - rsAPI api.RoomserverInternalAPI + rsAPI api.AppserviceRoomserverAPI serverName string workerStates []types.ApplicationServiceWorkerState } @@ -49,7 +49,7 @@ func NewOutputRoomEventConsumer( cfg *config.Dendrite, js nats.JetStreamContext, appserviceDB storage.Database, - rsAPI api.RoomserverInternalAPI, + rsAPI api.AppserviceRoomserverAPI, workerStates []types.ApplicationServiceWorkerState, ) *OutputRoomEventConsumer { return &OutputRoomEventConsumer{ |