API: NotificationSubject show Issue/Pull State (#12901)

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()

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"`
+	Title            string    `json:"title"`
-	URL              string `json:"url"`
+	URL              string    `json:"url"`
-	LatestCommentURL string `json:"latest_comment_url"`
+	LatestCommentURL string    `json:"latest_comment_url"`
-	Type             string `json:"type" binding:"In(Issue,Pull,Commit)"`
+	Type             string    `json:"type" binding:"In(Issue,Pull,Commit)"`
+	State            StateType `json:"state"`
 }
 
 // NotificationCount number of unread notifications

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"