From dccb0c15b996ac4dc0307cbfed140ce1558d7e3c Mon Sep 17 00:00:00 2001
From: Unknwon <u@gogs.io>
Date: Sun, 14 Aug 2016 04:17:26 -0700
Subject: Replace convert.To with APIFormat calls
---
routers/api/v1/user/follower.go | 3 +--
routers/api/v1/user/user.go | 5 ++---
2 files changed, 3 insertions(+), 5 deletions(-)
(limited to 'routers/api/v1/user')
diff --git a/routers/api/v1/user/follower.go b/routers/api/v1/user/follower.go
index 8d103c9e..58a16244 100644
--- a/routers/api/v1/user/follower.go
+++ b/routers/api/v1/user/follower.go
@@ -9,13 +9,12 @@ import (
"github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/context"
- "github.com/gogits/gogs/routers/api/v1/convert"
)
func responseApiUsers(ctx *context.APIContext, users []*models.User) {
apiUsers := make([]*api.User, len(users))
for i := range users {
- apiUsers[i] = convert.ToUser(users[i])
+ apiUsers[i] = users[i].APIFormat()
}
ctx.JSON(200, &apiUsers)
}
diff --git a/routers/api/v1/user/user.go b/routers/api/v1/user/user.go
index 87a9c086..b526af5d 100644
--- a/routers/api/v1/user/user.go
+++ b/routers/api/v1/user/user.go
@@ -11,7 +11,6 @@ import (
"github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/context"
- "github.com/gogits/gogs/routers/api/v1/convert"
)
func Search(ctx *context.APIContext) {
@@ -67,9 +66,9 @@ func GetInfo(ctx *context.APIContext) {
if !ctx.IsSigned {
u.Email = ""
}
- ctx.JSON(200, convert.ToUser(u))
+ ctx.JSON(200, u.APIFormat())
}
func GetAuthenticatedUser(ctx *context.APIContext) {
- ctx.JSON(200, convert.ToUser(ctx.User))
+ ctx.JSON(200, ctx.User.APIFormat())
}
--
cgit v1.2.3