luckyimnotanigger/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2025-05-31 20:02:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

fix(web): forbid blocked users from reopening issues (#7010)

Browse source 
Closes https://codeberg.org/forgejo/forgejo/issues/6841.

Signed-off-by: Litchi Pi <litchi.pi@proton.me>
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7010
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
Reviewed-by: 0ko <0ko@noreply.codeberg.org>
Co-authored-by: Litchi Pi <litchi.pi@proton.me>
Co-committed-by: Litchi Pi <litchi.pi@proton.me>
This commit is contained in:
Litchi Pi 2025-03-01 12:39:52 +00:00 • committed by 0ko
parent ac08fc5b40
commit 9dd47d932f
6 changed files with 69 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

22
routers/web/repo/issue.go
View file

@ -1260,7 +1260,11 @@ func NewIssuePost(ctx *context.Context) {
if err := issue_service.NewIssue(ctx, repo, issue, labelIDs, attachments, assigneeIDs); err != nil {
if errors.Is(err, user_model.ErrBlockedByUser) {
ctx.JSONError(ctx.Tr("repo.issues.blocked_by_user"))
if issue.IsPull {
ctx.JSONError(ctx.Tr("repo.pulls.blocked_by_user"))
} else {
ctx.JSONError(ctx.Tr("repo.issues.blocked_by_user"))
}
return
} else if repo_model.IsErrUserDoesNotHaveAccessToRepo(err) {
ctx.Error(http.StatusBadRequest, "UserDoesNotHaveAccessToRepo", err.Error())
@ -2081,6 +2085,7 @@ func ViewIssue(ctx *context.Context) {
ctx.Data["OpenGraphDescription"] = issue.Content
ctx.Data["OpenGraphImageURL"] = issue.SummaryCardURL()
ctx.Data["OpenGraphImageAltText"] = ctx.Tr("repo.issues.summary_card_alt", issue.Title, issue.Repo.FullName())
ctx.Data["IsBlocked"] = ctx.Doer != nil && user_model.IsBlockedMultiple(ctx, []int64{issue.PosterID, issue.Repo.OwnerID}, ctx.Doer.ID)
prepareHiddenCommentType(ctx)
if ctx.Written() {
@ -3199,6 +3204,15 @@ func NewComment(ctx *context.Context) {
} else {
isClosed := form.Status == "close"
if err := issue_service.ChangeStatus(ctx, issue, ctx.Doer, "", isClosed); err != nil {
if errors.Is(err, user_model.ErrBlockedByUser) {
if issue.IsPull {
ctx.JSONError(ctx.Tr("repo.pulls.blocked_by_user"))
} else {
ctx.JSONError(ctx.Tr("repo.issues.blocked_by_user"))
}
return
}
log.Error("ChangeStatus: %v", err)
if issues_model.IsErrDependenciesLeft(err) {
@ -3240,7 +3254,11 @@ func NewComment(ctx *context.Context) {
comment, err := issue_service.CreateIssueComment(ctx, ctx.Doer, ctx.Repo.Repository, issue, form.Content, attachments)
if err != nil {
if errors.Is(err, user_model.ErrBlockedByUser) {
ctx.JSONError(ctx.Tr("repo.issues.comment.blocked_by_user"))
if issue.IsPull {
ctx.JSONError(ctx.Tr("repo.pulls.comment.blocked_by_user"))
} else {
ctx.JSONError(ctx.Tr("repo.issues.comment.blocked_by_user"))
}
} else {
ctx.ServerError("CreateIssueComment", err)
}