2 files changed, 138 insertions, 1 deletions

diff --git a/server/ui/controller/entry.go b/server/ui/controller/entry.go
index 01a9ac51..9a1ed8f5 100644
--- a/server/ui/controller/entry.go
+++ b/server/ui/controller/entry.go
@@ -373,6 +373,75 @@ func (c *Controller) ShowReadEntry(ctx *core.Context, request *core.Request, res
 	}))
 }
 
+// ShowStarredEntry shows a single feed entry in "starred" mode.
+func (c *Controller) ShowStarredEntry(ctx *core.Context, request *core.Request, response *core.Response) {
+	user := ctx.LoggedUser()
+
+	entryID, err := request.IntegerParam("entryID")
+	if err != nil {
+		response.HTML().BadRequest(err)
+		return
+	}
+
+	builder := c.store.GetEntryQueryBuilder(user.ID, user.Timezone)
+	builder.WithEntryID(entryID)
+	builder.WithoutStatus(model.EntryStatusRemoved)
+
+	entry, err := builder.GetEntry()
+	if err != nil {
+		response.HTML().ServerError(err)
+		return
+	}
+
+	if entry == nil {
+		response.HTML().NotFound()
+		return
+	}
+
+	if entry.Status == model.EntryStatusUnread {
+		err = c.store.SetEntriesStatus(user.ID, []int64{entry.ID}, model.EntryStatusRead)
+		if err != nil {
+			logger.Error("[Controller:ShowReadEntry] %v", err)
+			response.HTML().ServerError(nil)
+			return
+		}
+	}
+
+	args, err := c.getCommonTemplateArgs(ctx)
+	if err != nil {
+		response.HTML().ServerError(err)
+		return
+	}
+
+	builder = c.store.GetEntryQueryBuilder(user.ID, user.Timezone)
+	builder.WithStarred()
+
+	prevEntry, nextEntry, err := c.getEntryPrevNext(user, builder, entry.ID)
+	if err != nil {
+		response.HTML().ServerError(err)
+		return
+	}
+
+	nextEntryRoute := ""
+	if nextEntry != nil {
+		nextEntryRoute = ctx.Route("starredEntry", "entryID", nextEntry.ID)
+	}
+
+	prevEntryRoute := ""
+	if prevEntry != nil {
+		prevEntryRoute = ctx.Route("starredEntry", "entryID", prevEntry.ID)
+	}
+
+	response.HTML().Render("entry", args.Merge(tplParams{
+		"entry":          entry,
+		"prevEntry":      prevEntry,
+		"nextEntry":      nextEntry,
+		"nextEntryRoute": nextEntryRoute,
+		"prevEntryRoute": prevEntryRoute,
+		"menu":           "starred",
+	}))
+}
+
 // UpdateEntriesStatus handles Ajax request to update the status for a list of entries.
 func (c *Controller) UpdateEntriesStatus(ctx *core.Context, request *core.Request, response *core.Response) {
 	user := ctx.LoggedUser()
@@ -412,7 +481,7 @@ func (c *Controller) getEntryPrevNext(user *model.User, builder *storage.EntryQu
 	n := len(entries)
 	for i := 0; i < n; i++ {
 		if entries[i].ID == entryID {
-			if i-1 > 0 {
+			if i-1 >= 0 {
 				prev = entries[i-1]
 			}
 
diff --git a/server/ui/controller/starred.go b/server/ui/controller/starred.go
new file mode 100644
index 00000000..c0351570
--- /dev/null
+++ b/server/ui/controller/starred.go
@@ -0,0 +1,68 @@
+// Copyright 2017 Frédéric Guillot. All rights reserved.
+// Use of this source code is governed by the Apache 2.0
+// license that can be found in the LICENSE file.
+
+package controller
+
+import (
+	"github.com/miniflux/miniflux/logger"
+	"github.com/miniflux/miniflux/model"
+	"github.com/miniflux/miniflux/server/core"
+)
+
+// ShowStarredPage renders the page with all starred entries.
+func (c *Controller) ShowStarredPage(ctx *core.Context, request *core.Request, response *core.Response) {
+	user := ctx.LoggedUser()
+	offset := request.QueryIntegerParam("offset", 0)
+
+	args, err := c.getCommonTemplateArgs(ctx)
+	if err != nil {
+		response.HTML().ServerError(err)
+		return
+	}
+
+	builder := c.store.GetEntryQueryBuilder(user.ID, user.Timezone)
+	builder.WithoutStatus(model.EntryStatusRemoved)
+	builder.WithStarred()
+	builder.WithOrder(model.DefaultSortingOrder)
+	builder.WithDirection(user.EntryDirection)
+	builder.WithOffset(offset)
+	builder.WithLimit(nbItemsPerPage)
+
+	entries, err := builder.GetEntries()
+	if err != nil {
+		response.HTML().ServerError(err)
+		return
+	}
+
+	count, err := builder.CountEntries()
+	if err != nil {
+		response.HTML().ServerError(err)
+		return
+	}
+
+	response.HTML().Render("starred", args.Merge(tplParams{
+		"entries":    entries,
+		"total":      count,
+		"pagination": c.getPagination(ctx.Route("starred"), count, offset),
+		"menu":       "starred",
+	}))
+}
+
+// ToggleBookmark handles Ajax request to toggle bookmark value.
+func (c *Controller) ToggleBookmark(ctx *core.Context, request *core.Request, response *core.Response) {
+	user := ctx.LoggedUser()
+	entryID, err := request.IntegerParam("entryID")
+	if err != nil {
+		response.HTML().BadRequest(err)
+		return
+	}
+
+	if err := c.store.ToggleBookmark(user.ID, entryID); err != nil {
+		logger.Error("[Controller:UpdateEntryStatus] %v", err)
+		response.JSON().ServerError(nil)
+		return
+	}
+
+	response.JSON().Standard("OK")
+}