diff options
| author | devonh <devon.dmytro@gmail.com> | 2023-06-07 17:14:35 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-07 17:14:35 +0000 |
| commit | 8ea1a11105ea7e66aa459537bcbef0de606147cd (patch) | |
| tree | 62a539b761d078978226752c8d3ef23f1a80e677 /roomserver/state | |
| parent | 7a1fd7f512ce06a472a2051ee63eae4a270eb71a (diff) | |
Use SenderID Type (#3105)
Diffstat (limited to 'roomserver/state')
| -rw-r--r-- | roomserver/state/state.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/roomserver/state/state.go b/roomserver/state/state.go index 3131cbff..b9c5bbc4 100644 --- a/roomserver/state/state.go +++ b/roomserver/state/state.go @@ -44,7 +44,7 @@ type StateResolutionStorage interface { AddState(ctx context.Context, roomNID types.RoomNID, stateBlockNIDs []types.StateBlockNID, state []types.StateEntry) (types.StateSnapshotNID, error) Events(ctx context.Context, roomVersion gomatrixserverlib.RoomVersion, eventNIDs []types.EventNID) ([]types.Event, error) EventsFromIDs(ctx context.Context, roomInfo *types.RoomInfo, eventIDs []string) ([]types.Event, error) - GetUserIDForSender(ctx context.Context, roomID string, senderID string) (*spec.UserID, error) + GetUserIDForSender(ctx context.Context, roomID string, senderID spec.SenderID) (*spec.UserID, error) } type StateResolution struct { @@ -947,7 +947,7 @@ func (v *StateResolution) resolveConflictsV1( } // Resolve the conflicts. - resolvedEvents := gomatrixserverlib.ResolveStateConflicts(conflictedEvents, authEvents, func(roomID, senderID string) (*spec.UserID, error) { + resolvedEvents := gomatrixserverlib.ResolveStateConflicts(conflictedEvents, authEvents, func(roomID string, senderID spec.SenderID) (*spec.UserID, error) { return v.db.GetUserIDForSender(ctx, roomID, senderID) }) @@ -1061,7 +1061,7 @@ func (v *StateResolution) resolveConflictsV2( conflictedEvents, nonConflictedEvents, authEvents, - func(roomID, senderID string) (*spec.UserID, error) { + func(roomID string, senderID spec.SenderID) (*spec.UserID, error) { return v.db.GetUserIDForSender(ctx, roomID, senderID) }, ) |