mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-31 18:53:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix build hopefully

Browse source
This commit is contained in:
Neil Alexander 2022-02-10 09:36:02 +00:00
parent 7f13f87e0d
commit 1f5e811b40
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
1 changed files with 5 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
roomserver/internal/input/input_missing.go
View file

@ -43,7 +43,7 @@ type missingStateReq struct {
// nolint:gocyclo // nolint:gocyclo
func (t *missingStateReq) processEventWithMissingState( func (t *missingStateReq) processEventWithMissingState(
ctx context.Context, e *gomatrixserverlib.Event, roomVersion gomatrixserverlib.RoomVersion, ctx context.Context, e *gomatrixserverlib.Event, roomVersion gomatrixserverlib.RoomVersion,
) (*gomatrixserverlib.RespState, error) { ) (*parsedRespState, error) {
// We are missing the previous events for this events. // We are missing the previous events for this events.
// This means that there is a gap in our view of the history of the // This means that there is a gap in our view of the history of the
// room. There two ways that we can handle such a gap: // room. There two ways that we can handle such a gap:
@ -123,14 +123,9 @@ func (t *missingStateReq) processEventWithMissingState(
} }
t.hadEventsMutex.Unlock() t.hadEventsMutex.Unlock()
sendOutliers := func(resolvedState *gomatrixserverlib.RespState) error { sendOutliers := func(resolvedState *parsedRespState) error {
var outliers []*gomatrixserverlib.Event
outliers, err = resolvedState.Events()
if err != nil {
return fmt.Errorf("resolvedState.Events: %w", err)
}
var outlierRoomEvents []api.InputRoomEvent var outlierRoomEvents []api.InputRoomEvent
for _, outlier := range outliers { for _, outlier := range resolvedState.AuthEvents {
if hadEvents[outlier.EventID()] { if hadEvents[outlier.EventID()] {
continue continue
} }
@ -224,7 +219,7 @@ func (t *missingStateReq) processEventWithMissingState(
return resolvedState, nil return resolvedState, nil
} }
func (t *missingStateReq) lookupResolvedStateBeforeEvent(ctx context.Context, e *gomatrixserverlib.Event, roomVersion gomatrixserverlib.RoomVersion) (*gomatrixserverlib.RespState, error) { func (t *missingStateReq) lookupResolvedStateBeforeEvent(ctx context.Context, e *gomatrixserverlib.Event, roomVersion gomatrixserverlib.RoomVersion) (*parsedRespState, error) {
type respState struct { type respState struct {
// A snapshot is considered trustworthy if it came from our own roomserver. // A snapshot is considered trustworthy if it came from our own roomserver.
// That's because the state will have been through state resolution once // That's because the state will have been through state resolution once
@ -513,15 +508,7 @@ func (t *missingStateReq) getMissingEvents(ctx context.Context, e *gomatrixserve
// will be added and duplicates will be removed. // will be added and duplicates will be removed.
logger.Debugf("get_missing_events returned %d events", len(missingResp.Events)) logger.Debugf("get_missing_events returned %d events", len(missingResp.Events))
missingEvents := make([]*gomatrixserverlib.Event, len(missingResp.Events)) missingEvents := make([]*gomatrixserverlib.Event, len(missingResp.Events))
for i, evJSON := range missingResp.Events { for i, ev := range missingResp.Events.UntrustedEvents(roomVersion) {
ev, err := gomatrixserverlib.NewEventFromUntrustedJSON(evJSON, roomVersion)
if err != nil {
logger.WithError(err).WithField("event", string(evJSON)).Warn("NewEventFromUntrustedJSON: failed")
return nil, false, missingPrevEventsError{
eventID: e.EventID(),
err: err,
}
}
missingEvents[i] = t.cacheAndReturn(ev.Headered(roomVersion)).Unwrap() missingEvents[i] = t.cacheAndReturn(ev.Headered(roomVersion)).Unwrap()
} }