tdsds.com/gitea
1
1
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2025-08-09 19:18:20 +00:00
Code Releases Activity

Move webhook codes from service to webhook notification (#8712)

Browse Source 
* Move webhook codes from service to webhook notification

* move deletecomment webhook to notifications

* fix notification
This commit is contained in:
Lunny Xiao
2019-10-30 18:02:46 +08:00
committed by Lauris BH
parent f694bb45d7
commit ac6accef09
5 changed files with 94 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
routers/api/v1/repo/issue_comment.go
View File

@@ -10,7 +10,6 @@ import (
"code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/context"
"code.gitea.io/gitea/modules/notification"
api "code.gitea.io/gitea/modules/structs"
comment_service "code.gitea.io/gitea/services/comments"
)
@@ -196,8 +195,6 @@ func CreateIssueComment(ctx *context.APIContext, form api.CreateIssueCommentOpti
return
}
notification.NotifyCreateIssueComment(ctx.User, ctx.Repo.Repository, issue, comment)
ctx.JSON(201, comment.APIFormat())
}
@@ -305,8 +302,6 @@ func editIssueComment(ctx *context.APIContext, form api.EditIssueCommentOption)
return
}
notification.NotifyUpdateComment(ctx.User, comment, oldContent)
ctx.JSON(200, comment.APIFormat())
}
@@ -396,7 +391,5 @@ func deleteIssueComment(ctx *context.APIContext) {
return
}
notification.NotifyDeleteComment(ctx.User, comment)
ctx.Status(204)
}

8
routers/repo/issue.go
View File

@@ -1324,8 +1324,6 @@ func NewComment(ctx *context.Context, form auth.CreateCommentForm) {
return
}
notification.NotifyCreateIssueComment(ctx.User, ctx.Repo.Repository, issue, comment)
log.Trace("Comment created: %d/%d/%d", ctx.Repo.Repository.ID, issue.ID, comment.ID)
}
@@ -1375,8 +1373,6 @@ func UpdateCommentContent(ctx *context.Context) {
ctx.ServerError("UpdateAttachments", err)
}
notification.NotifyUpdateComment(ctx.User, comment, oldContent)
ctx.JSON(200, map[string]interface{}{
"content": string(markdown.Render([]byte(comment.Content), ctx.Query("context"), ctx.Repo.Repository.ComposeMetas())),
"attachments": attachmentsHTML(ctx, comment.Attachments),
@@ -1404,13 +1400,11 @@ func DeleteComment(ctx *context.Context) {
return
}
if err = models.DeleteComment(comment, ctx.User); err != nil {
if err = comment_service.DeleteComment(comment, ctx.User); err != nil {
ctx.ServerError("DeleteCommentByID", err)
return
}
notification.NotifyDeleteComment(ctx.User, comment)
ctx.Status(200)
}