From 0386c9860e38d04e9a8fd90dc4e33e571b90359b Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Fri, 3 Jan 2020 11:48:43 +0000 Subject: [PATCH] common.PartitionStorer in publicroomsapi interface --- publicroomsapi/consumers/roomserver.go | 4 ++-- publicroomsapi/storage/storage.go | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/publicroomsapi/consumers/roomserver.go b/publicroomsapi/consumers/roomserver.go index b7d42b111..9a817735a 100644 --- a/publicroomsapi/consumers/roomserver.go +++ b/publicroomsapi/consumers/roomserver.go @@ -29,7 +29,7 @@ import ( // OutputRoomEventConsumer consumes events that originated in the room server. type OutputRoomEventConsumer struct { roomServerConsumer *common.ContinualConsumer - db *storage.PublicRoomsServerDatabase + db storage.Database query api.RoomserverQueryAPI } @@ -37,7 +37,7 @@ type OutputRoomEventConsumer struct { func NewOutputRoomEventConsumer( cfg *config.Dendrite, kafkaConsumer sarama.Consumer, - store *storage.PublicRoomsServerDatabase, + store storage.Database, queryAPI api.RoomserverQueryAPI, ) *OutputRoomEventConsumer { consumer := common.ContinualConsumer{ diff --git a/publicroomsapi/storage/storage.go b/publicroomsapi/storage/storage.go index 43ba40cc3..7f33c186b 100644 --- a/publicroomsapi/storage/storage.go +++ b/publicroomsapi/storage/storage.go @@ -19,12 +19,14 @@ import ( "errors" "net/url" + "github.com/matrix-org/dendrite/common" "github.com/matrix-org/dendrite/publicroomsapi/storage/postgres" "github.com/matrix-org/dendrite/publicroomsapi/types" "github.com/matrix-org/gomatrixserverlib" ) type Database interface { + common.PartitionStorer GetRoomVisibility(ctx context.Context, roomID string) (bool, error) SetRoomVisibility(ctx context.Context, visible bool, roomID string) error CountPublicRooms(ctx context.Context) (int64, error)