bss
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Actual vote count in poll view

This commit is contained in:
rinpatch 2019-05-21 14:27:09 +03:00
parent a53d062730
commit f28747858b
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/pleroma/web/mastodon_api/views/status_view.ex
View File

@ -338,8 +338,6 @@ def render("poll.json", %{object: object} = _opts) do
(object.data["closed"] || object.data["endTime"]) (object.data["closed"] || object.data["endTime"])
|> NaiveDateTime.from_iso8601!() |> NaiveDateTime.from_iso8601!()
votes_count = object.data["votes_count"] || 0
expired = expired =
end_time end_time
|> NaiveDateTime.compare(NaiveDateTime.utc_now()) |> NaiveDateTime.compare(NaiveDateTime.utc_now())
@ -348,12 +346,14 @@ def render("poll.json", %{object: object} = _opts) do
_ -> false _ -> false
end end
options = {options, votes_count} =
Enum.map(options, fn %{"name" => name} = option -> Enum.map_reduce(options, 0, fn %{"name" => name} = option, count ->
%{ current_count = option["replies"]["totalItems"] || 0
{%{
title: HTML.strip_tags(name), title: HTML.strip_tags(name),
votes_count: option["replies"]["votes_count"] || 0 votes_count: current_count
} }, current_count + count}
end) end)
%{ %{