sigb.us/dendrite
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases 1 Wiki Activity

Move makeOutputNewRoomEvent

Browse source
This commit is contained in:
Till Faelligen 2023-11-23 19:33:08 +01:00
parent a4e111cd40
commit 53c474f93e
No known key found for this signature in database
GPG key ID: 3DF82D8AB9211D4E
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
roomserver/internal/input/input_latest_events.go
View file

@ -89,6 +89,12 @@ func (r *Inputer) updateLatestEvents(
return fmt.Errorf("u.doUpdateLatestEvents: %w", err) return fmt.Errorf("u.doUpdateLatestEvents: %w", err)
} }
update, err := u.makeOutputNewRoomEvent()
if err != nil {
return fmt.Errorf("u.makeOutputNewRoomEvent: %w", err)
}
updates = append(updates, *update)
// Send the event to the output logs. // Send the event to the output logs.
// We do this inside the database transaction to ensure that we only mark an event as sent if we sent it. // We do this inside the database transaction to ensure that we only mark an event as sent if we sent it.
// (n.b. this means that it's possible that the same event will be sent twice if the transaction fails but // (n.b. this means that it's possible that the same event will be sent twice if the transaction fails but
@ -184,7 +190,7 @@ func (u *latestEventsUpdater) doUpdateLatestEvents() ([]api.OutputEvent, error)
// Now that we know what the latest events are, it's time to get the // Now that we know what the latest events are, it's time to get the
// latest state. // latest state.
var updates []api.OutputEvent var membershipUpdates []api.OutputEvent
if extremitiesChanged || u.rewritesState { if extremitiesChanged || u.rewritesState {
if err = u.latestState(); err != nil { if err = u.latestState(); err != nil {
return nil, fmt.Errorf("u.latestState: %w", err) return nil, fmt.Errorf("u.latestState: %w", err)
@ -192,7 +198,7 @@ func (u *latestEventsUpdater) doUpdateLatestEvents() ([]api.OutputEvent, error)
// If we need to generate any output events then here's where we do it. // If we need to generate any output events then here's where we do it.
// TODO: Move this! // TODO: Move this!
if updates, err = u.api.updateMemberships(u.ctx, u.updater, u.removed, u.added); err != nil { if membershipUpdates, err = u.api.updateMemberships(u.ctx, u.updater, u.removed, u.added); err != nil {
return nil, fmt.Errorf("u.api.updateMemberships: %w", err) return nil, fmt.Errorf("u.api.updateMemberships: %w", err)
} }
} else { } else {
@ -203,13 +209,7 @@ func (u *latestEventsUpdater) doUpdateLatestEvents() ([]api.OutputEvent, error)
return nil, fmt.Errorf("u.updater.SetLatestEvents: %w", err) return nil, fmt.Errorf("u.updater.SetLatestEvents: %w", err)
} }
update, err := u.makeOutputNewRoomEvent() return membershipUpdates, nil
if err != nil {
return nil, fmt.Errorf("u.makeOutputNewRoomEvent: %w", err)
}
updates = append(updates, *update)
return updates, nil
} }
func (u *latestEventsUpdater) latestState() error { func (u *latestEventsUpdater) latestState() error {