diff options
| author | 6543 <6543@obermui.de> | 2020-02-29 03:49:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-28 23:49:50 -0300 |
| commit | 7e8cdba18120c4588d1921f07593a9a66eaa1411 (patch) | |
| tree | d7782277bb558c9cea1ccb262b81298330bb35ba /modules/notification | |
| parent | c32f3da33c38e18a7ed4a8c49de27898c2aa07f8 (diff) | |
| download | gitea-7e8cdba18120c4588d1921f07593a9a66eaa1411.tar.gz gitea-7e8cdba18120c4588d1921f07593a9a66eaa1411.zip | |
[Refactor] move APIFormat() of Issue and Label to convert package (#10423)
* Label: delete .APIFormat() and use convert.ToLabel()
* move issue APIFormat too
* add missing one
* move TEST too
* handle error -> return empty APIIssue
* Apply suggestions from code review
Co-Authored-By: guillep2k <18600385+guillep2k@users.noreply.github.com>
Co-authored-by: zeripath <art27@cantab.net>
Co-authored-by: guillep2k <18600385+guillep2k@users.noreply.github.com>
Diffstat (limited to 'modules/notification')
| -rw-r--r-- | modules/notification/webhook/webhook.go | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/modules/notification/webhook/webhook.go b/modules/notification/webhook/webhook.go index c1795d537b..f598d5b1f7 100644 --- a/modules/notification/webhook/webhook.go +++ b/modules/notification/webhook/webhook.go @@ -59,7 +59,7 @@ func (m *webhookNotifier) NotifyIssueClearLabels(doer *models.User, issue *model err = webhook_module.PrepareWebhooks(issue.Repo, models.HookEventIssues, &api.IssuePayload{ Action: api.HookIssueLabelCleared, Index: issue.Index, - Issue: issue.APIFormat(), + Issue: convert.ToAPIIssue(issue), Repository: issue.Repo.APIFormat(mode), Sender: doer.APIFormat(), }) @@ -155,7 +155,7 @@ func (m *webhookNotifier) NotifyIssueChangeAssignee(doer *models.User, issue *mo mode, _ := models.AccessLevelUnit(doer, issue.Repo, models.UnitTypeIssues) apiIssue := &api.IssuePayload{ Index: issue.Index, - Issue: issue.APIFormat(), + Issue: convert.ToAPIIssue(issue), Repository: issue.Repo.APIFormat(mode), Sender: doer.APIFormat(), } @@ -202,7 +202,7 @@ func (m *webhookNotifier) NotifyIssueChangeTitle(doer *models.User, issue *model From: oldTitle, }, }, - Issue: issue.APIFormat(), + Issue: convert.ToAPIIssue(issue), Repository: issue.Repo.APIFormat(mode), Sender: issue.Poster.APIFormat(), }) @@ -237,7 +237,7 @@ func (m *webhookNotifier) NotifyIssueChangeStatus(doer *models.User, issue *mode } else { apiIssue := &api.IssuePayload{ Index: issue.Index, - Issue: issue.APIFormat(), + Issue: convert.ToAPIIssue(issue), Repository: issue.Repo.APIFormat(mode), Sender: doer.APIFormat(), } @@ -267,7 +267,7 @@ func (m *webhookNotifier) NotifyNewIssue(issue *models.Issue) { if err := webhook_module.PrepareWebhooks(issue.Repo, models.HookEventIssues, &api.IssuePayload{ Action: api.HookIssueOpened, Index: issue.Index, - Issue: issue.APIFormat(), + Issue: convert.ToAPIIssue(issue), Repository: issue.Repo.APIFormat(mode), Sender: issue.Poster.APIFormat(), }); err != nil { @@ -327,7 +327,7 @@ func (m *webhookNotifier) NotifyIssueChangeContent(doer *models.User, issue *mod From: oldContent, }, }, - Issue: issue.APIFormat(), + Issue: convert.ToAPIIssue(issue), Repository: issue.Repo.APIFormat(mode), Sender: doer.APIFormat(), }) @@ -355,7 +355,7 @@ func (m *webhookNotifier) NotifyUpdateComment(doer *models.User, c *models.Comme mode, _ := models.AccessLevel(doer, c.Issue.Repo) if err := webhook_module.PrepareWebhooks(c.Issue.Repo, models.HookEventIssueComment, &api.IssueCommentPayload{ Action: api.HookIssueCommentEdited, - Issue: c.Issue.APIFormat(), + Issue: convert.ToAPIIssue(c.Issue), Comment: c.APIFormat(), Changes: &api.ChangesPayload{ Body: &api.ChangesFromPayload{ @@ -375,7 +375,7 @@ func (m *webhookNotifier) NotifyCreateIssueComment(doer *models.User, repo *mode mode, _ := models.AccessLevel(doer, repo) if err := webhook_module.PrepareWebhooks(repo, models.HookEventIssueComment, &api.IssueCommentPayload{ Action: api.HookIssueCommentCreated, - Issue: issue.APIFormat(), + Issue: convert.ToAPIIssue(issue), Comment: comment.APIFormat(), Repository: repo.APIFormat(mode), Sender: doer.APIFormat(), @@ -404,7 +404,7 @@ func (m *webhookNotifier) NotifyDeleteComment(doer *models.User, comment *models if err := webhook_module.PrepareWebhooks(comment.Issue.Repo, models.HookEventIssueComment, &api.IssueCommentPayload{ Action: api.HookIssueCommentDeleted, - Issue: comment.Issue.APIFormat(), + Issue: convert.ToAPIIssue(comment.Issue), Comment: comment.APIFormat(), Repository: comment.Issue.Repo.APIFormat(mode), Sender: doer.APIFormat(), @@ -449,7 +449,7 @@ func (m *webhookNotifier) NotifyIssueChangeLabels(doer *models.User, issue *mode err = webhook_module.PrepareWebhooks(issue.Repo, models.HookEventIssues, &api.IssuePayload{ Action: api.HookIssueLabelUpdated, Index: issue.Index, - Issue: issue.APIFormat(), + Issue: convert.ToAPIIssue(issue), Repository: issue.Repo.APIFormat(mode), Sender: doer.APIFormat(), }) @@ -491,7 +491,7 @@ func (m *webhookNotifier) NotifyIssueChangeMilestone(doer *models.User, issue *m err = webhook_module.PrepareWebhooks(issue.Repo, models.HookEventIssues, &api.IssuePayload{ Action: hookAction, Index: issue.Index, - Issue: issue.APIFormat(), + Issue: convert.ToAPIIssue(issue), Repository: issue.Repo.APIFormat(mode), Sender: doer.APIFormat(), }) |