aboutsummaryrefslogtreecommitdiff
path: root/cmd/dendritejs
diff options
context:
space:
mode:
authorKegsay <kegan@matrix.org>2020-06-30 13:34:59 +0100
committerGitHub <noreply@github.com>2020-06-30 13:34:59 +0100
commit6f49758b90d655d9c2bb9170da2ea1d0a2bdd664 (patch)
treef434cc48f27c3915fffdb39c5b907fd021d4ff61 /cmd/dendritejs
parentca5bbffd8d987b220c8f8eb888a2fc9b9cef104c (diff)
Remove membership table from account DB (#1172)
* Remove membership table from account DB And make code which needs that data use the currentstate server * Unbreak tests; use a membership enum for space
Diffstat (limited to 'cmd/dendritejs')
-rw-r--r--cmd/dendritejs/main.go4
1 files changed, 4 insertions, 0 deletions
diff --git a/cmd/dendritejs/main.go b/cmd/dendritejs/main.go
index 883b0fad..11f339b0 100644
--- a/cmd/dendritejs/main.go
+++ b/cmd/dendritejs/main.go
@@ -22,6 +22,7 @@ import (
"syscall/js"
"github.com/matrix-org/dendrite/appservice"
+ "github.com/matrix-org/dendrite/currentstateserver"
"github.com/matrix-org/dendrite/eduserver"
"github.com/matrix-org/dendrite/eduserver/cache"
"github.com/matrix-org/dendrite/federationsender"
@@ -218,6 +219,8 @@ func main() {
logrus.WithError(err).Panicf("failed to connect to public rooms db")
}
+ stateAPI := currentstateserver.NewInternalAPI(base.Cfg, base.KafkaConsumer)
+
monolith := setup.Monolith{
Config: base.Cfg,
AccountDB: accountDB,
@@ -232,6 +235,7 @@ func main() {
EDUInternalAPI: eduInputAPI,
FederationSenderAPI: fedSenderAPI,
RoomserverAPI: rsAPI,
+ StateAPI: stateAPI,
UserAPI: userAPI,
//ServerKeyAPI: serverKeyAPI,