Merge branch 'master' into matthew/peeking

This commit is contained in:
Neil Alexander 2020-09-04 16:08:12 +01:00
commit 64fe2741c0
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
33 changed files with 289 additions and 101 deletions

View file

@ -112,11 +112,6 @@ type mockStateAPI struct {
rsAPI *mockRoomserverAPI
}
// QueryRoomsForUser retrieves a list of room IDs matching the given query.
func (s *mockStateAPI) QueryRoomsForUser(ctx context.Context, req *stateapi.QueryRoomsForUserRequest, res *stateapi.QueryRoomsForUserResponse) error {
return nil
}
// QueryBulkStateContent does a bulk query for state event content in the given rooms.
func (s *mockStateAPI) QueryBulkStateContent(ctx context.Context, req *stateapi.QueryBulkStateContentRequest, res *stateapi.QueryBulkStateContentResponse) error {
var res2 api.QueryBulkStateContentResponse