aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/api/controller
diff options
context:
space:
mode:
authorGravatar Frédéric Guillot <fred@miniflux.net>2017-11-27 21:30:04 -0800
committerGravatar Frédéric Guillot <fred@miniflux.net>2017-11-27 21:40:05 -0800
commitbb8e61c7c5d9f297bde207c6de07a5d4b67dcd29 (patch)
tree1d907010e659bbcf65c32df8d10fd91de97a8703 /server/api/controller
parent8781648af9f730d8bd1a7d9c395c1f28f9058716 (diff)
Make sure golint pass on the code base
Diffstat (limited to 'server/api/controller')
-rw-r--r--server/api/controller/category.go3
-rw-r--r--server/api/controller/feed.go6
-rw-r--r--server/api/controller/user.go9
3 files changed, 10 insertions, 8 deletions
diff --git a/server/api/controller/category.go b/server/api/controller/category.go
index bf89411..5cf88bd 100644
--- a/server/api/controller/category.go
+++ b/server/api/controller/category.go
@@ -6,6 +6,7 @@ package api
import (
"errors"
+
"github.com/miniflux/miniflux2/server/api/payload"
"github.com/miniflux/miniflux2/server/core"
)
@@ -65,7 +66,7 @@ func (c *Controller) UpdateCategory(ctx *core.Context, request *core.Request, re
// GetCategories is the API handler to get a list of categories for a given user.
func (c *Controller) GetCategories(ctx *core.Context, request *core.Request, response *core.Response) {
- categories, err := c.store.GetCategories(ctx.UserID())
+ categories, err := c.store.Categories(ctx.UserID())
if err != nil {
response.JSON().ServerError(errors.New("Unable to fetch categories"))
return
diff --git a/server/api/controller/feed.go b/server/api/controller/feed.go
index 282e81c..73bf241 100644
--- a/server/api/controller/feed.go
+++ b/server/api/controller/feed.go
@@ -66,7 +66,7 @@ func (c *Controller) UpdateFeed(ctx *core.Context, request *core.Request, respon
return
}
- originalFeed, err := c.store.GetFeedById(userID, feedID)
+ originalFeed, err := c.store.FeedByID(userID, feedID)
if err != nil {
response.JSON().NotFound(errors.New("Unable to find this feed"))
return
@@ -88,7 +88,7 @@ func (c *Controller) UpdateFeed(ctx *core.Context, request *core.Request, respon
// GetFeeds is the API handler that get all feeds that belongs to the given user.
func (c *Controller) GetFeeds(ctx *core.Context, request *core.Request, response *core.Response) {
- feeds, err := c.store.GetFeeds(ctx.UserID())
+ feeds, err := c.store.Feeds(ctx.UserID())
if err != nil {
response.JSON().ServerError(errors.New("Unable to fetch feeds from the database"))
return
@@ -106,7 +106,7 @@ func (c *Controller) GetFeed(ctx *core.Context, request *core.Request, response
return
}
- feed, err := c.store.GetFeedById(userID, feedID)
+ feed, err := c.store.FeedByID(userID, feedID)
if err != nil {
response.JSON().ServerError(errors.New("Unable to fetch this feed"))
return
diff --git a/server/api/controller/user.go b/server/api/controller/user.go
index 3ea6650..fcf24b6 100644
--- a/server/api/controller/user.go
+++ b/server/api/controller/user.go
@@ -6,6 +6,7 @@ package api
import (
"errors"
+
"github.com/miniflux/miniflux2/server/api/payload"
"github.com/miniflux/miniflux2/server/core"
)
@@ -67,7 +68,7 @@ func (c *Controller) UpdateUser(ctx *core.Context, request *core.Request, respon
return
}
- originalUser, err := c.store.GetUserById(userID)
+ originalUser, err := c.store.UserByID(userID)
if err != nil {
response.JSON().BadRequest(errors.New("Unable to fetch this user from the database"))
return
@@ -94,7 +95,7 @@ func (c *Controller) GetUsers(ctx *core.Context, request *core.Request, response
return
}
- users, err := c.store.GetUsers()
+ users, err := c.store.Users()
if err != nil {
response.JSON().ServerError(errors.New("Unable to fetch the list of users"))
return
@@ -116,7 +117,7 @@ func (c *Controller) GetUser(ctx *core.Context, request *core.Request, response
return
}
- user, err := c.store.GetUserById(userID)
+ user, err := c.store.UserByID(userID)
if err != nil {
response.JSON().BadRequest(errors.New("Unable to fetch this user from the database"))
return
@@ -143,7 +144,7 @@ func (c *Controller) RemoveUser(ctx *core.Context, request *core.Request, respon
return
}
- user, err := c.store.GetUserById(userID)
+ user, err := c.store.UserByID(userID)
if err != nil {
response.JSON().ServerError(errors.New("Unable to fetch this user from the database"))
return