From 4845bf357aeb2cf9c6bbdae19e7ff0176539d9dd Mon Sep 17 00:00:00 2001 From: Umputun Date: Sun, 7 Apr 2019 14:12:40 -0500 Subject: [PATCH] restore rest setter for vote info of the current user --- backend/app/rest/api/rest.go | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/backend/app/rest/api/rest.go b/backend/app/rest/api/rest.go index 6774e810..59101517 100644 --- a/backend/app/rest/api/rest.go +++ b/backend/app/rest/api/rest.go @@ -312,19 +312,28 @@ func (s *Rest) alterComments(comments []store.Comment, r *http.Request) (res []s // prepare vote info for client view vote := func(c store.Comment, r *http.Request) store.Comment { - _, err := rest.GetUserInfo(r) + c.Vote = 0 //default is "none" (not voted) + + user, err := rest.GetUserInfo(r) if err != nil { - c.Vote = 0 //default is "none" (not voted) for non-authed user - c.Votes = nil // hide voters list + c.Votes = nil // hide voters list and don't set Vote for non-authed user return c } + if v, ok := c.Votes[user.ID]; ok { + if v { + c.Vote = 1 + } else { + c.Vote = -1 + } + } + c.Votes = nil // hide voters list return c } for i, c := range res { - c = vote(c, r) // hide voters list + c = vote(c, r) res[i] = c }