diff options
| author | Kegsay <kegan@matrix.org> | 2020-09-03 17:20:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-03 17:20:54 +0100 |
| commit | b20386123e0cbdc53016231f0087d0047b5667e9 (patch) | |
| tree | f037957006b0295709be9890c22fdb4563a1d2be /roomserver/internal/api.go | |
| parent | 6150de6cb3611ffc61ce10ed6714f65e51e38e78 (diff) | |
Move currentstateserver API to roomserver (#1387)
* Move currentstateserver API to roomserver
Stub out DB functions for now, nothing uses the roomserver version yet.
* Allow it to startup
* Implement some current-state-server storage interface functions
* Add missing package
Diffstat (limited to 'roomserver/internal/api.go')
| -rw-r--r-- | roomserver/internal/api.go | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/roomserver/internal/api.go b/roomserver/internal/api.go index 93c0be77..bdea650e 100644 --- a/roomserver/internal/api.go +++ b/roomserver/internal/api.go @@ -7,6 +7,7 @@ import ( fsAPI "github.com/matrix-org/dendrite/federationsender/api" "github.com/matrix-org/dendrite/internal/caching" "github.com/matrix-org/dendrite/internal/config" + "github.com/matrix-org/dendrite/roomserver/acls" "github.com/matrix-org/dendrite/roomserver/api" "github.com/matrix-org/dendrite/roomserver/internal/input" "github.com/matrix-org/dendrite/roomserver/internal/perform" @@ -46,8 +47,9 @@ func NewRoomserverAPI( ServerName: cfg.Matrix.ServerName, KeyRing: keyRing, Queryer: &query.Queryer{ - DB: roomserverDB, - Cache: caches, + DB: roomserverDB, + Cache: caches, + ServerACLs: acls.NewServerACLs(roomserverDB), }, Inputer: &input.Inputer{ DB: roomserverDB, |