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

Move roomInfo

Browse source
This commit is contained in:
Till Faelligen 2023-11-23 19:44:48 +01:00
parent 416dbcee76
commit 2047cca580
No known key found for this signature in database
GPG key ID: 3DF82D8AB9211D4E
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -74,7 +74,6 @@ func (r *Inputer) updateLatestEvents(
ctx: ctx, ctx: ctx,
api: r, api: r,
updater: updater, updater: updater,
roomInfo: roomInfo,
stateAtEvent: stateAtEvent, stateAtEvent: stateAtEvent,
event: event, event: event,
rewritesState: rewritesState, rewritesState: rewritesState,
@ -82,7 +81,7 @@ func (r *Inputer) updateLatestEvents(
} }
var updates []api.OutputEvent var updates []api.OutputEvent
updates, err = u.doUpdateLatestEvents() updates, err = u.doUpdateLatestEvents(roomInfo)
if err != nil { if err != nil {
return fmt.Errorf("u.doUpdateLatestEvents: %w", err) return fmt.Errorf("u.doUpdateLatestEvents: %w", err)
} }
@ -123,7 +122,6 @@ type latestEventsUpdater struct {
ctx context.Context ctx context.Context
api *Inputer api *Inputer
updater *shared.RoomUpdater updater *shared.RoomUpdater
roomInfo *types.RoomInfo
stateAtEvent types.StateAtEvent stateAtEvent types.StateAtEvent
event gomatrixserverlib.PDU event gomatrixserverlib.PDU
rewritesState bool rewritesState bool
@ -147,7 +145,7 @@ type latestEventsUpdater struct {
historyVisibility gomatrixserverlib.HistoryVisibility historyVisibility gomatrixserverlib.HistoryVisibility
} }
func (u *latestEventsUpdater) doUpdateLatestEvents() ([]api.OutputEvent, error) { func (u *latestEventsUpdater) doUpdateLatestEvents(roomInfo *types.RoomInfo) ([]api.OutputEvent, error) {
u.lastEventIDSent = u.updater.LastEventIDSent() u.lastEventIDSent = u.updater.LastEventIDSent()
// If we are doing a regular event update then we will get the // If we are doing a regular event update then we will get the
@ -187,7 +185,7 @@ func (u *latestEventsUpdater) doUpdateLatestEvents() ([]api.OutputEvent, error)
// latest state. // latest state.
var membershipUpdates []api.OutputEvent var membershipUpdates []api.OutputEvent
if extremitiesChanged || u.rewritesState { if extremitiesChanged || u.rewritesState {
if err = u.latestState(); err != nil { if err = u.latestState(roomInfo); err != nil {
return nil, fmt.Errorf("u.latestState: %w", err) return nil, fmt.Errorf("u.latestState: %w", err)
} }
@ -200,19 +198,19 @@ func (u *latestEventsUpdater) doUpdateLatestEvents() ([]api.OutputEvent, error)
u.newStateNID = u.oldStateNID u.newStateNID = u.oldStateNID
} }
if err = u.updater.SetLatestEvents(u.roomInfo.RoomNID, u.latest, u.stateAtEvent.EventNID, u.newStateNID); err != nil { if err = u.updater.SetLatestEvents(roomInfo.RoomNID, u.latest, u.stateAtEvent.EventNID, u.newStateNID); err != nil {
return nil, fmt.Errorf("u.updater.SetLatestEvents: %w", err) return nil, fmt.Errorf("u.updater.SetLatestEvents: %w", err)
} }
return membershipUpdates, nil return membershipUpdates, nil
} }
func (u *latestEventsUpdater) latestState() error { func (u *latestEventsUpdater) latestState(roomInfo *types.RoomInfo) error {
trace, ctx := internal.StartRegion(u.ctx, "processEventWithMissingState") trace, ctx := internal.StartRegion(u.ctx, "processEventWithMissingState")
defer trace.EndRegion() defer trace.EndRegion()
var err error var err error
roomState := state.NewStateResolution(u.updater, u.roomInfo, u.api.Queryer) roomState := state.NewStateResolution(u.updater, roomInfo, u.api.Queryer)
// Work out if the state at the extremities has actually changed // Work out if the state at the extremities has actually changed
// or not. If they haven't then we won't bother doing all of the // or not. If they haven't then we won't bother doing all of the