diff options
Diffstat (limited to 'services/user/block.go')
| -rw-r--r-- | services/user/block.go | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/services/user/block.go b/services/user/block.go index c24ce5273c..7727780dfc 100644 --- a/services/user/block.go +++ b/services/user/block.go @@ -117,10 +117,10 @@ func BlockUser(ctx context.Context, doer, blocker, blockee *user_model.User, not } // cancel each other repository transfers - if err := cancelRepositoryTransfers(ctx, blocker, blockee); err != nil { + if err := cancelRepositoryTransfers(ctx, doer, blocker, blockee); err != nil { return err } - if err := cancelRepositoryTransfers(ctx, blockee, blocker); err != nil { + if err := cancelRepositoryTransfers(ctx, doer, blockee, blocker); err != nil { return err } @@ -192,7 +192,7 @@ func unwatchRepos(ctx context.Context, watcher, repoOwner *user_model.User) erro } } -func cancelRepositoryTransfers(ctx context.Context, sender, recipient *user_model.User) error { +func cancelRepositoryTransfers(ctx context.Context, doer, sender, recipient *user_model.User) error { transfers, err := repo_model.GetPendingRepositoryTransfers(ctx, &repo_model.PendingRepositoryTransferOptions{ SenderID: sender.ID, RecipientID: recipient.ID, @@ -202,12 +202,7 @@ func cancelRepositoryTransfers(ctx context.Context, sender, recipient *user_mode } for _, transfer := range transfers { - repo, err := repo_model.GetRepositoryByID(ctx, transfer.RepoID) - if err != nil { - return err - } - - if err := repo_service.CancelRepositoryTransfer(ctx, repo); err != nil { + if err := repo_service.CancelRepositoryTransfer(ctx, transfer, doer); err != nil { return err } } |