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

Move lastEventIDSent

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

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

@ -86,7 +86,7 @@ func (r *Inputer) updateLatestEvents(
return fmt.Errorf("u.doUpdateLatestEvents: %w", err) return fmt.Errorf("u.doUpdateLatestEvents: %w", err)
} }
update, err := u.makeOutputNewRoomEvent(transactionID, sendAsServer) update, err := u.makeOutputNewRoomEvent(transactionID, sendAsServer, updater.LastEventIDSent())
if err != nil { if err != nil {
return fmt.Errorf("u.makeOutputNewRoomEvent: %w", err) return fmt.Errorf("u.makeOutputNewRoomEvent: %w", err)
} }
@ -125,8 +125,6 @@ type latestEventsUpdater struct {
stateAtEvent types.StateAtEvent stateAtEvent types.StateAtEvent
event gomatrixserverlib.PDU event gomatrixserverlib.PDU
rewritesState bool rewritesState bool
// The eventID of the event that was processed before this one.
lastEventIDSent string
// The latest events in the room after processing this event. // The latest events in the room after processing this event.
oldLatest types.StateAtEventAndReferences oldLatest types.StateAtEventAndReferences
latest types.StateAtEventAndReferences latest types.StateAtEventAndReferences
@ -146,8 +144,6 @@ type latestEventsUpdater struct {
} }
func (u *latestEventsUpdater) doUpdateLatestEvents(roomInfo *types.RoomInfo) ([]api.OutputEvent, error) { func (u *latestEventsUpdater) doUpdateLatestEvents(roomInfo *types.RoomInfo) ([]api.OutputEvent, error) {
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
// previous latest events to use as a part of the calculation. If // previous latest events to use as a part of the calculation. If
// we are overwriting the latest events because we have a complete // we are overwriting the latest events because we have a complete
@ -383,7 +379,7 @@ func (u *latestEventsUpdater) calculateLatest(
return true, nil return true, nil
} }
func (u *latestEventsUpdater) makeOutputNewRoomEvent(transactionID *api.TransactionID, sendAsServer string) (*api.OutputEvent, error) { func (u *latestEventsUpdater) makeOutputNewRoomEvent(transactionID *api.TransactionID, sendAsServer string, lastEventIDSent string) (*api.OutputEvent, error) {
latestEventIDs := make([]string, len(u.latest)) latestEventIDs := make([]string, len(u.latest))
for i := range u.latest { for i := range u.latest {
latestEventIDs[i] = u.latest[i].EventID latestEventIDs[i] = u.latest[i].EventID
@ -392,7 +388,7 @@ func (u *latestEventsUpdater) makeOutputNewRoomEvent(transactionID *api.Transact
ore := api.OutputNewRoomEvent{ ore := api.OutputNewRoomEvent{
Event: &types.HeaderedEvent{PDU: u.event}, Event: &types.HeaderedEvent{PDU: u.event},
RewritesState: u.rewritesState, RewritesState: u.rewritesState,
LastSentEventID: u.lastEventIDSent, LastSentEventID: lastEventIDSent,
LatestEventIDs: latestEventIDs, LatestEventIDs: latestEventIDs,
TransactionID: transactionID, TransactionID: transactionID,
SendAsServer: sendAsServer, SendAsServer: sendAsServer,