diff --git a/models/org.go b/models/org.go index 1fd6039b6dcf3..5bac00e271b3e 100644 --- a/models/org.go +++ b/models/org.go @@ -495,7 +495,7 @@ func (org *User) GetUserRepositories(userID int64, page, pageSize int) ([]*Repos repos := make([]*Repository, 0, pageSize) // FIXME: use XORM chain operations instead of raw SQL. if err = x.Sql(fmt.Sprintf(`SELECT repository.* FROM repository - INNER JOIN team_repo + INNER JOIN team_repo ON team_repo.repo_id = repository.id WHERE (repository.owner_id = ? AND repository.is_private = ?) OR team_repo.team_id IN (%s) GROUP BY repository.id @@ -507,7 +507,7 @@ func (org *User) GetUserRepositories(userID int64, page, pageSize int) ([]*Repos } results, err := x.Query(fmt.Sprintf(`SELECT repository.id FROM repository - INNER JOIN team_repo + INNER JOIN team_repo ON team_repo.repo_id = repository.id WHERE (repository.owner_id = ? AND repository.is_private = ?) OR team_repo.team_id IN (%s) GROUP BY repository.id @@ -534,7 +534,7 @@ func (org *User) GetUserMirrorRepositories(userID int64) ([]*Repository, error) repos := make([]*Repository, 0, 10) if err = x.Sql(fmt.Sprintf(`SELECT repository.* FROM repository - INNER JOIN team_repo + INNER JOIN team_repo ON team_repo.repo_id = repository.id AND repository.is_mirror = ? WHERE (repository.owner_id = ? AND repository.is_private = ?) OR team_repo.team_id IN (%s) GROUP BY repository.id diff --git a/models/user.go b/models/user.go index 32242e0ea6b75..9cdf31f16d314 100644 --- a/models/user.go +++ b/models/user.go @@ -1121,3 +1121,22 @@ func UnfollowUser(userID, followID int64) (err error) { } return sess.Commit() } + +func GetStarredRepos(userID int64) ([]*Repository, error) { + sess := x.NewSession() + defer sessionRelease(sess) + stars := make([]*Star, 0, 10) + err := sess.Find(&stars, &Star{UID: userID}) + if err != nil { + return nil, err + } + repos := make([]*Repository, len(stars)) + for i, star := range stars { + r, err := GetRepositoryByID(star.RepoID) + if err != nil { + return nil, err + } + repos[i] = r + } + return repos, nil +} diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go index 2d468eae5fe25..21277d0c52df9 100644 --- a/routers/api/v1/api.go +++ b/routers/api/v1/api.go @@ -200,6 +200,8 @@ func RegisterRoutes(m *macaron.Macaron) { m.Get("", user.ListFollowing) m.Get("/:target", user.CheckFollowing) }) + + m.Get("/starred", user.GetStarredRepos) }) }, reqToken()) @@ -221,6 +223,15 @@ func RegisterRoutes(m *macaron.Macaron) { m.Combo("/:id").Get(user.GetPublicKey). Delete(user.DeletePublicKey) }) + + m.Group("/starred", func() { + m.Get("", user.GetMyStarredRepos) + m.Group("/:username/:reponame", func() { + m.Get("", user.IsStarring) + m.Put("", user.Star) + m.Delete("", user.Unstar) + }) + }) }, reqToken()) // Repositories diff --git a/routers/api/v1/repo/repo.go b/routers/api/v1/repo/repo.go index e6890ca33d3d5..96d56deb99e1a 100644 --- a/routers/api/v1/repo/repo.go +++ b/routers/api/v1/repo/repo.go @@ -238,7 +238,7 @@ func Migrate(ctx *context.APIContext, form auth.MigrateRepoForm) { ctx.JSON(201, repo.APIFormat(&api.Permission{true, true, true})) } -func parseOwnerAndRepo(ctx *context.APIContext) (*models.User, *models.Repository) { +func ParseOwnerAndRepo(ctx *context.APIContext) (*models.User, *models.Repository) { owner, err := models.GetUserByName(ctx.Params(":username")) if err != nil { if models.IsErrUserNotExist(err) { @@ -264,7 +264,7 @@ func parseOwnerAndRepo(ctx *context.APIContext) (*models.User, *models.Repositor // https://github.com/gogits/go-gogs-client/wiki/Repositories#get func Get(ctx *context.APIContext) { - _, repo := parseOwnerAndRepo(ctx) + _, repo := ParseOwnerAndRepo(ctx) if ctx.Written() { return } @@ -274,7 +274,7 @@ func Get(ctx *context.APIContext) { // https://github.com/gogits/go-gogs-client/wiki/Repositories#delete func Delete(ctx *context.APIContext) { - owner, repo := parseOwnerAndRepo(ctx) + owner, repo := ParseOwnerAndRepo(ctx) if ctx.Written() { return } diff --git a/routers/api/v1/user/star.go b/routers/api/v1/user/star.go new file mode 100644 index 0000000000000..6e74573267a45 --- /dev/null +++ b/routers/api/v1/user/star.go @@ -0,0 +1,80 @@ +// Copyright 2016 The Gogs Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package user + +import ( + api "github.com/gogits/go-gogs-client" + + "github.com/go-gitea/gitea/models" + "github.com/go-gitea/gitea/modules/context" + "github.com/go-gitea/gitea/routers/api/v1/repo" +) + +func getStarredRepos(userID int64) ([]*api.Repository, error) { + starredRepos, err := models.GetStarredRepos(userID) + if err != nil { + return nil, err + } + repos := make([]*api.Repository, len(starredRepos)) + for i, starred := range starredRepos { + repos[i] = starred.APIFormat(&api.Permission{true, true, true}) + } + return repos, nil +} + +func GetStarredRepos(ctx *context.APIContext) { + user := GetUserByParams(ctx) + repos, err := getStarredRepos(user.ID) + if err != nil { + ctx.Error(500, "getStarredRepos", err) + } + ctx.JSON(200, &repos) +} + +func GetMyStarredRepos(ctx *context.APIContext) { + repos, err := getStarredRepos(ctx.User.ID) + if err != nil { + ctx.Error(500, "getStarredRepos", err) + } + ctx.JSON(200, &repos) +} + +func IsStarring(ctx *context.APIContext) { + _, repository := repo.ParseOwnerAndRepo(ctx) + if ctx.Written() { + return + } + if models.IsStaring(ctx.User.ID, repository.ID) { + ctx.Status(204) + } else { + ctx.Status(404) + } +} + +func Star(ctx *context.APIContext) { + _, repository := repo.ParseOwnerAndRepo(ctx) + if ctx.Written() { + return + } + err := models.StarRepo(ctx.User.ID, repository.ID, true) + if err != nil { + ctx.Error(500, "StarRepo", err) + return + } + ctx.Status(204) +} + +func Unstar(ctx *context.APIContext) { + _, repository := repo.ParseOwnerAndRepo(ctx) + if ctx.Written() { + return + } + err := models.StarRepo(ctx.User.ID, repository.ID, false) + if err != nil { + ctx.Error(500, "StarRepo", err) + return + } + ctx.Status(204) +}