magic_rb/forgejo
Template
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo synced 2024-11-29 05:06:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

subscribers return []user.APIFormat

Browse source
This commit is contained in:
6543 2019-10-29 12:45:37 +01:00
parent 06daf4e863
commit deaf69c801
No known key found for this signature in database
GPG key ID: A1CA74D27FD13271
3 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
modules/structs/issue.go
View file

@ -113,9 +113,3 @@ type EditPriorityOption struct {
// required:true
Priority int `json:"priority"`
}
// IssueWatchers list of subscribers of an issue
type IssueWatchers struct {
// required:true
Subscribers []string `json:"subscribers"`
}

2
routers/api/v1/api.go
View file

@ -689,7 +689,7 @@ func RegisterRoutes(m *macaron.Macaron) {
m.Post("/stop", reqToken(), repo.StopIssueStopwatch)
})
m.Group("/subscriptions", func() {
m.Get("", reqToken(), bind(api.IssueWatchers{}), repo.GetIssueWatchers)
m.Get("", reqToken(), bind(api.User{}), repo.GetIssueWatchers)
m.Put("/:user", reqToken(), repo.AddIssueSubscription)
m.Delete("/:user", reqToken(), repo.DelIssueSubscription)
})

11
routers/api/v1/repo/issue.go
View file

@ -744,7 +744,7 @@ func DelIssueSubscription(ctx *context.APIContext) {
}
// GetIssueWatchers return subscribers of an issue
func GetIssueWatchers(ctx *context.APIContext, form api.IssueWatchers) {
func GetIssueWatchers(ctx *context.APIContext, form api.User) {
// swagger:operation GET /repos/{owner}/{repo}/issues/{index}/subscriptions issue issueSubscriptions
// ---
// summary: Get users who subscribed on an issue.
@ -785,21 +785,20 @@ func GetIssueWatchers(ctx *context.APIContext, form api.IssueWatchers) {
return
}
var subscribers []string
iw, err := models.GetIssueWatchers(issue.ID)
if err != nil {
ctx.Error(500, "GetIssueWatchers", err)
return
}
for _, s := range iw {
subscribers := make([]*api.User, len(iw))
for i, s := range iw {
user, err := models.GetUserByID(s.UserID)
if err != nil {
continue
}
subscribers = append(subscribers, user.LoginName)
subscribers[i] = user.APIFormat()
}
ctx.JSON(200, api.IssueWatchers{Subscribers: subscribers})
ctx.JSON(200, subscribers)
}