hoernschen/dendrite
1
0
Fork 0
mirror of https://github.com/hoernschen/dendrite.git synced 2025-08-02 14:12:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Some refactoring

Browse source
This commit is contained in:
Neil Alexander 2021-01-21 11:18:10 +00:00
parent 9b2b7a6e28
commit e254594453
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
7 changed files with 193 additions and 173 deletions
Download patch file Download diff file Expand all files Collapse all files

20
syncapi/storage/shared/syncserver.go
View file

@ -516,20 +516,20 @@ func (d *Database) EventPositionInStream(
}
func (d *Database) MostRecentMembership(
ctx context.Context, roomID, userID string,
) (*gomatrixserverlib.HeaderedEvent, types.StreamPosition, error) {
event, err := d.CurrentRoomState.SelectStateEvent(ctx, roomID, gomatrixserverlib.MRoomMember, userID)
ctx context.Context, roomID, userID string, memberships []string,
) (*gomatrixserverlib.HeaderedEvent, types.StreamPosition, types.StreamPosition, error) {
eventID, streamPos, topoPos, err := d.Memberships.SelectMembership(ctx, nil, roomID, userID, memberships)
if err != nil {
return nil, 0, fmt.Errorf("d.CurrentRoomState.SelectStateEvent: %w", err)
return nil, 0, 0, fmt.Errorf("d.CurrentRoomState.SelectStateEvent: %w", err)
}
if event == nil {
return nil, 0, nil
}
pos, err := d.OutputEvents.SelectPositionInStream(ctx, nil, event.EventID())
events, err := d.OutputEvents.SelectEvents(ctx, nil, []string{eventID})
if err != nil {
return nil, 0, fmt.Errorf("d.OutputEvents.SelectPositionInStream: %w", err)
return nil, 0, 0, fmt.Errorf("d.OutputEvents.SelectEvents: %w", err)
}
return event, pos, nil
if len(events) == 0 {
return nil, 0, 0, fmt.Errorf("no event returned")
}
return events[0].HeaderedEvent, streamPos, topoPos, err
}
func (d *Database) GetFilter(