Fix #1655 by re-adding the appservice alias query (#1660)

2 files changed, 7 insertions, 0 deletions

diff --git a/roomserver/api/api.go b/roomserver/api/api.go
index ebc068ac..cedd6193 100644
--- a/roomserver/api/api.go
+++ b/roomserver/api/api.go
@@ -3,6 +3,7 @@ package api
 import (
 	"context"
 
+	asAPI "github.com/matrix-org/dendrite/appservice/api"
 	fsAPI "github.com/matrix-org/dendrite/federationsender/api"
 )
 
@@ -11,6 +12,7 @@ type RoomserverInternalAPI interface {
 	// needed to avoid chicken and egg scenario when setting up the
 	// interdependencies between the roomserver and other input APIs
 	SetFederationSenderAPI(fsAPI fsAPI.FederationSenderInternalAPI)
+	SetAppserviceAPI(asAPI asAPI.AppServiceQueryAPI)
 
 	InputRoomEvents(
 		ctx context.Context,
diff --git a/roomserver/api/api_trace.go b/roomserver/api/api_trace.go
index c279807e..40745975 100644
--- a/roomserver/api/api_trace.go
+++ b/roomserver/api/api_trace.go
@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 
+	asAPI "github.com/matrix-org/dendrite/appservice/api"
 	fsAPI "github.com/matrix-org/dendrite/federationsender/api"
 	"github.com/matrix-org/util"
 )
@@ -19,6 +20,10 @@ func (t *RoomserverInternalAPITrace) SetFederationSenderAPI(fsAPI fsAPI.Federati
 	t.Impl.SetFederationSenderAPI(fsAPI)
 }
 
+func (t *RoomserverInternalAPITrace) SetAppserviceAPI(asAPI asAPI.AppServiceQueryAPI) {
+	t.Impl.SetAppserviceAPI(asAPI)
+}
+
 func (t *RoomserverInternalAPITrace) InputRoomEvents(
 	ctx context.Context,
 	req *InputRoomEventsRequest,