Skip to content

Commit 9b9d162

Browse files
lunnysapk
authored andcommitted
fix wrong sender when send slack webhook (#7918)
1 parent 8c10d91 commit 9b9d162

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

models/release.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,7 @@ func UpdateRelease(doer *User, gitRepo *git.Repository, rel *Release, attachment
409409
Action: api.HookReleaseUpdated,
410410
Release: rel.APIFormat(),
411411
Repository: rel.Repo.APIFormat(mode),
412-
Sender: rel.Publisher.APIFormat(),
412+
Sender: doer.APIFormat(),
413413
}); err1 != nil {
414414
log.Error("PrepareWebhooks: %v", err)
415415
} else {
@@ -420,7 +420,7 @@ func UpdateRelease(doer *User, gitRepo *git.Repository, rel *Release, attachment
420420
}
421421

422422
// DeleteReleaseByID deletes a release and corresponding Git tag by given ID.
423-
func DeleteReleaseByID(id int64, u *User, delTag bool) error {
423+
func DeleteReleaseByID(id int64, doer *User, delTag bool) error {
424424
rel, err := GetReleaseByID(id)
425425
if err != nil {
426426
return fmt.Errorf("GetReleaseByID: %v", err)
@@ -459,12 +459,12 @@ func DeleteReleaseByID(id int64, u *User, delTag bool) error {
459459
return fmt.Errorf("LoadAttributes: %v", err)
460460
}
461461

462-
mode, _ := AccessLevel(u, rel.Repo)
462+
mode, _ := AccessLevel(doer, rel.Repo)
463463
if err := PrepareWebhooks(rel.Repo, HookEventRelease, &api.ReleasePayload{
464464
Action: api.HookReleaseDeleted,
465465
Release: rel.APIFormat(),
466466
Repository: rel.Repo.APIFormat(mode),
467-
Sender: rel.Publisher.APIFormat(),
467+
Sender: doer.APIFormat(),
468468
}); err != nil {
469469
log.Error("PrepareWebhooks: %v", err)
470470
} else {

0 commit comments

Comments
 (0)