Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

ToggleVote introduced to control voting / unvoting.

Matt Roberts1c6d8783fa68
diff --git a/app/cmd/routes.go b/app/cmd/routes.go
index 4406917e2..f8a1b4b7c 100644
--- a/app/cmd/routes.go
+++ b/app/cmd/routes.go
@@ -203,6 +203,7 @@ func routes(r *web.Engine) *web.Engine {
membersApi.Delete("/api/v1/posts/:number/comments/:id", apiv1.DeleteComment())
membersApi.Post("/api/v1/posts/:number/votes", apiv1.AddVote())
membersApi.Delete("/api/v1/posts/:number/votes", apiv1.RemoveVote())
+ membersApi.Post("/api/v1/posts/:number/votes/toggle", apiv1.ToggleVote())
membersApi.Post("/api/v1/posts/:number/subscription", apiv1.Subscribe())
membersApi.Delete("/api/v1/posts/:number/subscription", apiv1.Unsubscribe())
diff --git a/app/handlers/apiv1/post.go b/app/handlers/apiv1/post.go
index 4fae6210a..32cbbf81f 100644
--- a/app/handlers/apiv1/post.go
+++ b/app/handlers/apiv1/post.go
@@ -377,6 +377,52 @@ func RemoveVote() web.HandlerFunc {
}
}
+func ToggleVote() web.HandlerFunc {
+ return func(c *web.Context) error {
+ number, err := c.ParamAsInt("number")
+ if err != nil {
+ return c.NotFound()
+ }
+
+ getPost := &query.GetPostByNumber{Number: number}
+ if err := bus.Dispatch(c, getPost); err != nil {
+ return c.Failure(err)
+ }
+
+ if getPost.Result == nil {
+ return c.NotFound()
+ }
+
+ listVotes := &query.ListPostVotes{PostID: getPost.Result.ID}
+ if err := bus.Dispatch(c, listVotes); err != nil {
+ return c.Failure(err)
+ }
+
+ hasVoted := false
+ for _, vote := range listVotes.Result {
+ if vote.User.ID == c.User().ID {
+ hasVoted = true
+ break
+ }
+ }
+
+ if hasVoted {
+ err := bus.Dispatch(c, &cmd.RemoveVote{Post: getPost.Result, User: c.User()})
+ if err != nil {
+ return c.Failure(err)
+ }
+ return c.Ok(web.Map{"voted": false})
+ }
+
+ err = bus.Dispatch(c, &cmd.AddVote{Post: getPost.Result, User: c.User()})
+ if err != nil {
+ return c.Failure(err)
+ }
+ metrics.TotalVotes.Inc()
+ return c.Ok(web.Map{"voted": true})
+ }
+}
+
// Subscribe adds current user to list of subscribers of given post
func Subscribe() web.HandlerFunc {
return func(c *web.Context) error {
diff --git a/public/pages/ShowPost/ShowPost.page.tsx b/public/pages/ShowPost/ShowPost.page.tsx
index 0025400b5..f3d08a4b6 100644
--- a/public/pages/ShowPost/ShowPost.page.tsx
+++ b/public/pages/ShowPost/ShowPost.page.tsx
@@ -277,7 +277,7 @@ export default class ShowPostPage extends React.Component<ShowPostPageProps, Sho
<VStack spacing={4}>
{!this.state.editMode ? (
<HStack justify="between" align="start">
- <VoteSection post={this.props.post} votes={this.props.votes} />
+ <VoteSection post={this.props.post} votes={this.props.post.votesCount} />
<FollowButton post={this.props.post} subscribed={this.props.subscribed} />
</HStack>
) : (
diff --git a/public/pages/ShowPost/components/VoteSection.tsx b/public/pages/ShowPost/components/VoteSection.tsx
index 7d302faac..b517ab492 100644
--- a/public/pages/ShowPost/components/VoteSection.tsx
+++ b/public/pages/ShowPost/components/VoteSection.tsx
@@ -1,5 +1,5 @@
import React, { useState } from "react"
-import { Post, PostStatus, Vote } from "@fider/models"
+import { Post, PostStatus } from "@fider/models"
import { actions } from "@fider/services"
import { Button, Icon, SignInModal } from "@fider/components"
import { useFider } from "@fider/hooks"
@@ -7,18 +7,16 @@ import IconThumbsUp from "@fider/assets/images/heroicons-thumbsup.svg"
import IconCheck from "@fider/assets/images/heroicons-check.svg"
import { Trans } from "@lingui/macro"
import { HStack, VStack } from "@fider/components/layout"
-// import { VotesPanel } from "./VotesPanel"
interface VoteSectionProps {
post: Post
- votes: Vote[]
+ votes: number
}
export const VoteSection = (props: VoteSectionProps) => {
const fider = useFider()
- const [hasVoted, setHasVoted] = useState(props.post.hasVoted)
const [votes, setVotes] = useState(props.votes)
- const [post, setPost] = useState(props.post)
+ const [hasVoted, setHasVoted] = useState(props.post.hasVoted)
const [isSignInModalOpen, setIsSignInModalOpen] = useState(false)
const voteOrUndo = async () => {
@@ -27,17 +25,10 @@ export const VoteSection = (props: VoteSectionProps) => {
return
}
- const action = hasVoted ? actions.removeVote : actions.addVote
-
- const response = await action(props.post.number)
+ const response = await actions.toggleVote(props.post.number)
if (response.ok) {
- const newVotes: Vote[] = hasVoted
- ? votes.filter((vote) => vote.user.id !== fider.session.user.id)
- : [...votes, { user: fider.session.user, createdAt: new Date() }]
-
- setPost({ ...post, votesCount: newVotes.length })
- setVotes(newVotes)
- setHasVoted(!hasVoted)
+ setVotes(response.data.voted ? votes + 1 : votes - 1)
+ setHasVoted(response.data.voted)
}
}
@@ -61,9 +52,9 @@ export const VoteSection = (props: VoteSectionProps) => {
</div>
<HStack align="center">
<span className="text-semibold text-2xl" style={{ fontSize: "32px", minHeight: "48px" }}>
- {votes.length}
+ {votes}
</span>
- <span className="text-semibold text-lg">{votes.length === 1 ? "Vote" : "Votes"}</span>
+ <span className="text-semibold text-lg">{votes === 1 ? "Vote" : "Votes"}</span>
</HStack>
</VStack>
)
diff --git a/public/services/actions/post.ts b/public/services/actions/post.ts
index c19438faf..2e0eda699 100644
--- a/public/services/actions/post.ts
+++ b/public/services/actions/post.ts
@@ -44,6 +44,10 @@ export const removeVote = async (postNumber: number): Promise<Result> => {
return http.delete(`/api/v1/posts/${postNumber}/votes`).then(http.event("post", "unvote"))
}
+export const toggleVote = async (postNumber: number): Promise<Result<{ voted: boolean }>> => {
+ return http.post<{ voted: boolean }>(`/api/v1/posts/${postNumber}/votes/toggle`).then(http.event("post", "toggle-vote"))
+}
+
export const subscribe = async (postNumber: number): Promise<Result> => {
return http.post(`/api/v1/posts/${postNumber}/subscription`).then(http.event("post", "subscribe"))
}