diff --git a/stateresolution.go b/stateresolution.go index ef9aa1d6..d629455d 100644 --- a/stateresolution.go +++ b/stateresolution.go @@ -331,7 +331,7 @@ func ResolveConflicts( events []PDU, authEvents []PDU, userIDForSender spec.UserIDForSender, - isRejected IsRejected, + isRejectedFn IsRejected, ) ([]PDU, error) { type stateKeyTuple struct { Type string @@ -390,7 +390,7 @@ func ResolveConflicts( resolved = ResolveStateConflicts(conflicted, authEvents, userIDForSender) resolved = append(resolved, notConflicted...) case StateResV2: - resolved = ResolveStateConflictsV2(conflicted, notConflicted, authEvents, userIDForSender, isRejected) + resolved = ResolveStateConflictsV2(conflicted, notConflicted, authEvents, userIDForSender, isRejectedFn) default: return nil, fmt.Errorf("unsupported state resolution algorithm %v", stateResAlgo) } diff --git a/stateresolutionv2.go b/stateresolutionv2.go index 12a842b6..8ff346cd 100644 --- a/stateresolutionv2.go +++ b/stateresolutionv2.go @@ -46,7 +46,7 @@ type stateResolverV2 struct { resolvedMembers map[spec.SenderID]PDU // Resolved member events resolvedOthers map[StateKeyTuple]PDU // Resolved other events result []PDU // Final list of resolved events - isRejected IsRejected // Check if the given eventID is rejected + isRejectedFn IsRejected // Check if the given eventID is rejected } // IsRejected should return if the given eventID is rejected or not. @@ -59,7 +59,7 @@ func ResolveStateConflictsV2( conflicted, unconflicted, authEvents []PDU, userIDForSender spec.UserIDForSender, - isRejected IsRejected, + isRejectedFn IsRejected, ) []PDU { // Prepare the state resolver. conflictedControlEvents := make([]PDU, 0, len(conflicted)) @@ -74,7 +74,7 @@ func ResolveStateConflictsV2( resolvedMembers: make(map[spec.SenderID]PDU, len(conflicted)), resolvedOthers: make(map[StateKeyTuple]PDU, len(conflicted)), result: make([]PDU, 0, len(conflicted)+len(unconflicted)), - isRejected: isRejected, + isRejectedFn: isRejectedFn, } var roomID *spec.RoomID if len(conflicted) > 0 { @@ -466,7 +466,7 @@ func (r *stateResolverV2) authAndApplyEvents(events []PDU) { } if authEv.Type() == spec.MRoomMember && authEv.StateKeyEquals(needed) { // Don't use rejected events for auth - if r.isRejected(authEventID) { + if r.isRejectedFn(authEventID) { continue } _ = r.authProvider.AddEvent(authEv)