diff options
| author | Kegsay <kegan@matrix.org> | 2020-09-07 12:38:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-07 12:38:09 +0100 |
| commit | 79137599217808d9f9585628408a6c2aa26ab11d (patch) | |
| tree | 6b7aa04541b563767ddd0ca04c873c634127678c /syncapi/consumers | |
| parent | 895ead804893191b34fd52a549b22331997d45f7 (diff) | |
Remove QueryBulkStateContent from current state server (#1404)
* Remove QueryBulkStateContent from current state server
Expected fail due to db impl not existing
* Implement query bulk state content
* Fix up rejecting invites over federation
* Fix bulk content marshalling
Diffstat (limited to 'syncapi/consumers')
| -rw-r--r-- | syncapi/consumers/keychange.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/syncapi/consumers/keychange.go b/syncapi/consumers/keychange.go index 33797378..5b50bac2 100644 --- a/syncapi/consumers/keychange.go +++ b/syncapi/consumers/keychange.go @@ -133,7 +133,7 @@ func (s *OutputKeyChangeEventConsumer) onMessage(msg *sarama.ConsumerMessage) er func (s *OutputKeyChangeEventConsumer) OnJoinEvent(ev *gomatrixserverlib.HeaderedEvent) { // work out who we are now sharing rooms with which we previously were not and notify them about the joining // users keys: - changed, _, err := syncinternal.TrackChangedUsers(context.Background(), s.rsAPI, s.stateAPI, *ev.StateKey(), []string{ev.RoomID()}, nil) + changed, _, err := syncinternal.TrackChangedUsers(context.Background(), s.rsAPI, *ev.StateKey(), []string{ev.RoomID()}, nil) if err != nil { log.WithError(err).Error("OnJoinEvent: failed to work out changed users") return @@ -146,7 +146,7 @@ func (s *OutputKeyChangeEventConsumer) OnJoinEvent(ev *gomatrixserverlib.Headere func (s *OutputKeyChangeEventConsumer) OnLeaveEvent(ev *gomatrixserverlib.HeaderedEvent) { // work out who we are no longer sharing any rooms with and notify them about the leaving user - _, left, err := syncinternal.TrackChangedUsers(context.Background(), s.rsAPI, s.stateAPI, *ev.StateKey(), nil, []string{ev.RoomID()}) + _, left, err := syncinternal.TrackChangedUsers(context.Background(), s.rsAPI, *ev.StateKey(), nil, []string{ev.RoomID()}) if err != nil { log.WithError(err).Error("OnLeaveEvent: failed to work out left users") return |