oss/miniflux-v2
oss/miniflux-v2
1
0
Fork 0
mirror of https://github.com/miniflux/v2.git synced 2025-08-06 17:41:00 +00:00
Code Wiki Activity

Improve Response to be more idiomatic

Browse source
This commit is contained in:
Frédéric Guillot 2017-11-21 18:30:16 -08:00
parent 25cbd65777
commit 02ff7b4bcf
25 changed files with 302 additions and 275 deletions
Download patch file Download diff file Expand all files Collapse all files

44
server/api/controller/feed.go
View file

@ -15,17 +15,17 @@ func (c *Controller) CreateFeed(ctx *core.Context, request *core.Request, respon
userID := ctx.GetUserID()
feedURL, categoryID, err := payload.DecodeFeedCreationPayload(request.Body())
if err != nil {
response.Json().BadRequest(err)
response.JSON().BadRequest(err)
return
}
feed, err := c.feedHandler.CreateFeed(userID, categoryID, feedURL)
if err != nil {
response.Json().ServerError(errors.New("Unable to create this feed"))
response.JSON().ServerError(errors.New("Unable to create this feed"))
return
}
response.Json().Created(feed)
response.JSON().Created(feed)
}
// RefreshFeed is the API handler to refresh a feed.
@ -33,17 +33,17 @@ func (c *Controller) RefreshFeed(ctx *core.Context, request *core.Request, respo
userID := ctx.GetUserID()
feedID, err := request.IntegerParam("feedID")
if err != nil {
response.Json().BadRequest(err)
response.JSON().BadRequest(err)
return
}
err = c.feedHandler.RefreshFeed(userID, feedID)
if err != nil {
response.Json().ServerError(errors.New("Unable to refresh this feed"))
response.JSON().ServerError(errors.New("Unable to refresh this feed"))
return
}
response.Json().NoContent()
response.JSON().NoContent()
}
// UpdateFeed is the API handler that is used to update a feed.
@ -51,45 +51,45 @@ func (c *Controller) UpdateFeed(ctx *core.Context, request *core.Request, respon
userID := ctx.GetUserID()
feedID, err := request.IntegerParam("feedID")
if err != nil {
response.Json().BadRequest(err)
response.JSON().BadRequest(err)
return
}
newFeed, err := payload.DecodeFeedModificationPayload(request.Body())
if err != nil {
response.Json().BadRequest(err)
response.JSON().BadRequest(err)
return
}
originalFeed, err := c.store.GetFeedById(userID, feedID)
if err != nil {
response.Json().NotFound(errors.New("Unable to find this feed"))
response.JSON().NotFound(errors.New("Unable to find this feed"))
return
}
if originalFeed == nil {
response.Json().NotFound(errors.New("Feed not found"))
response.JSON().NotFound(errors.New("Feed not found"))
return
}
originalFeed.Merge(newFeed)
if err := c.store.UpdateFeed(originalFeed); err != nil {
response.Json().ServerError(errors.New("Unable to update this feed"))
response.JSON().ServerError(errors.New("Unable to update this feed"))
return
}
response.Json().Created(originalFeed)
response.JSON().Created(originalFeed)
}
// 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.GetUserID())
if err != nil {
response.Json().ServerError(errors.New("Unable to fetch feeds from the database"))
response.JSON().ServerError(errors.New("Unable to fetch feeds from the database"))
return
}
response.Json().Standard(feeds)
response.JSON().Standard(feeds)
}
// GetFeed is the API handler to get a feed.
@ -97,22 +97,22 @@ func (c *Controller) GetFeed(ctx *core.Context, request *core.Request, response
userID := ctx.GetUserID()
feedID, err := request.IntegerParam("feedID")
if err != nil {
response.Json().BadRequest(err)
response.JSON().BadRequest(err)
return
}
feed, err := c.store.GetFeedById(userID, feedID)
if err != nil {
response.Json().ServerError(errors.New("Unable to fetch this feed"))
response.JSON().ServerError(errors.New("Unable to fetch this feed"))
return
}
if feed == nil {
response.Json().NotFound(errors.New("Feed not found"))
response.JSON().NotFound(errors.New("Feed not found"))
return
}
response.Json().Standard(feed)
response.JSON().Standard(feed)
}
// RemoveFeed is the API handler to remove a feed.
@ -120,19 +120,19 @@ func (c *Controller) RemoveFeed(ctx *core.Context, request *core.Request, respon
userID := ctx.GetUserID()
feedID, err := request.IntegerParam("feedID")
if err != nil {
response.Json().BadRequest(err)
response.JSON().BadRequest(err)
return
}
if !c.store.FeedExists(userID, feedID) {
response.Json().NotFound(errors.New("Feed not found"))
response.JSON().NotFound(errors.New("Feed not found"))
return
}
if err := c.store.RemoveFeed(userID, feedID); err != nil {
response.Json().ServerError(errors.New("Unable to remove this feed"))
response.JSON().ServerError(errors.New("Unable to remove this feed"))
return
}
response.Json().NoContent()
response.JSON().NoContent()
}