aboutsummaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/convert/notification.go8
-rw-r--r--modules/structs/notifications.go24
2 files changed, 23 insertions, 9 deletions
diff --git a/modules/convert/notification.go b/modules/convert/notification.go
index cc941678b6..b0888ee09f 100644
--- a/modules/convert/notification.go
+++ b/modules/convert/notification.go
@@ -27,7 +27,7 @@ func ToNotificationThread(n *models.Notification) *api.NotificationThread {
//handle Subject
switch n.Source {
case models.NotificationSourceIssue:
- result.Subject = &api.NotificationSubject{Type: "Issue"}
+ result.Subject = &api.NotificationSubject{Type: api.NotifySubjectIssue}
if n.Issue != nil {
result.Subject.Title = n.Issue.Title
result.Subject.URL = n.Issue.APIURL()
@@ -38,7 +38,7 @@ func ToNotificationThread(n *models.Notification) *api.NotificationThread {
}
}
case models.NotificationSourcePullRequest:
- result.Subject = &api.NotificationSubject{Type: "Pull"}
+ result.Subject = &api.NotificationSubject{Type: api.NotifySubjectPull}
if n.Issue != nil {
result.Subject.Title = n.Issue.Title
result.Subject.URL = n.Issue.APIURL()
@@ -55,13 +55,13 @@ func ToNotificationThread(n *models.Notification) *api.NotificationThread {
}
case models.NotificationSourceCommit:
result.Subject = &api.NotificationSubject{
- Type: "Commit",
+ Type: api.NotifySubjectCommit,
Title: n.CommitID,
URL: n.Repository.HTMLURL() + "/commit/" + n.CommitID,
}
case models.NotificationSourceRepository:
result.Subject = &api.NotificationSubject{
- Type: "Repository",
+ Type: api.NotifySubjectRepository,
Title: n.Repository.FullName(),
URL: n.Repository.Link(),
}
diff --git a/modules/structs/notifications.go b/modules/structs/notifications.go
index 8daa6de168..675dcf76b1 100644
--- a/modules/structs/notifications.go
+++ b/modules/structs/notifications.go
@@ -21,14 +21,28 @@ 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)"`
- State StateType `json:"state"`
+ Title string `json:"title"`
+ URL string `json:"url"`
+ LatestCommentURL string `json:"latest_comment_url"`
+ Type NotifySubjectType `json:"type" binding:"In(Issue,Pull,Commit)"`
+ State StateType `json:"state"`
}
// NotificationCount number of unread notifications
type NotificationCount struct {
New int64 `json:"new"`
}
+
+// NotifySubjectType represent type of notification subject
+type NotifySubjectType string
+
+const (
+ // NotifySubjectIssue an issue is subject of an notification
+ NotifySubjectIssue NotifySubjectType = "Issue"
+ // NotifySubjectPull an pull is subject of an notification
+ NotifySubjectPull NotifySubjectType = "Pull"
+ // NotifySubjectCommit an commit is subject of an notification
+ NotifySubjectCommit NotifySubjectType = "Commit"
+ // NotifySubjectRepository an repository is subject of an notification
+ NotifySubjectRepository NotifySubjectType = "Repository"
+)