diff options
| author | 6543 <6543@obermui.de> | 2020-09-21 01:10:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-20 19:10:53 -0400 |
| commit | 2dbca92a0f145ddf6d0e3d4487be28071f6fd792 (patch) | |
| tree | adbf05dd475f3504683cddb95e52ad42aa7210ce | |
| parent | 3f9eb93cc6f7de012d25ec17be510a448a6f6042 (diff) | |
| download | gitea-2dbca92a0f145ddf6d0e3d4487be28071f6fd792.tar.gz gitea-2dbca92a0f145ddf6d0e3d4487be28071f6fd792.zip | |
API: NotificationSubject show Issue/Pull State (#12901)
| -rw-r--r-- | models/notification.go | 2 | ||||
| -rw-r--r-- | modules/structs/notifications.go | 9 | ||||
| -rw-r--r-- | templates/swagger/v1_json.tmpl | 3 |
3 files changed, 10 insertions, 4 deletions
diff --git a/models/notification.go b/models/notification.go index 80d837078a..1f51c99c4c 100644 --- a/models/notification.go +++ b/models/notification.go @@ -354,6 +354,7 @@ func (n *Notification) APIFormat() *api.NotificationThread { if n.Issue != nil { result.Subject.Title = n.Issue.Title result.Subject.URL = n.Issue.APIURL() + result.Subject.State = n.Issue.State() comment, err := n.Issue.GetLastComment() if err == nil && comment != nil { result.Subject.LatestCommentURL = comment.APIURL() @@ -364,6 +365,7 @@ func (n *Notification) APIFormat() *api.NotificationThread { if n.Issue != nil { result.Subject.Title = n.Issue.Title result.Subject.URL = n.Issue.APIURL() + result.Subject.State = n.Issue.State() comment, err := n.Issue.GetLastComment() if err == nil && comment != nil { result.Subject.LatestCommentURL = comment.APIURL() diff --git a/modules/structs/notifications.go b/modules/structs/notifications.go index b6c9774a97..8daa6de168 100644 --- a/modules/structs/notifications.go +++ b/modules/structs/notifications.go @@ -21,10 +21,11 @@ type NotificationThread struct { // NotificationSubject contains the notification subject (Issue/Pull/Commit) type NotificationSubject struct { - Title string `json:"title"` - URL string `json:"url"` - LatestCommentURL string `json:"latest_comment_url"` - Type string `json:"type" binding:"In(Issue,Pull,Commit)"` + Title string `json:"title"` + URL string `json:"url"` + LatestCommentURL string `json:"latest_comment_url"` + Type string `json:"type" binding:"In(Issue,Pull,Commit)"` + State StateType `json:"state"` } // NotificationCount number of unread notifications diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl index b687b4c57f..6792f7444b 100644 --- a/templates/swagger/v1_json.tmpl +++ b/templates/swagger/v1_json.tmpl @@ -13835,6 +13835,9 @@ "type": "string", "x-go-name": "LatestCommentURL" }, + "state": { + "$ref": "#/definitions/StateType" + }, "title": { "type": "string", "x-go-name": "Title" |