Include own_votes in the poll data

This commit is contained in:
Mark Felder 2021-01-22 09:47:59 -06:00
parent d8860eaee4
commit 6bfd497f4a
3 changed files with 27 additions and 7 deletions

View file

@ -59,6 +59,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
<summary>API Changes</summary>
- Mastodon API: Current user is now included in conversation if it's the only participant.
- Mastodon API: Fixed last_status.account being not filled with account data.
- Mastodon API: Fixed own_votes being not returned with poll data.
</details>
## Unreleased (Patch)

View file

@ -10,6 +10,7 @@ defmodule Pleroma.Web.MastodonAPI.PollView do
def render("show.json", %{object: object, multiple: multiple, options: options} = params) do
{end_time, expired} = end_time_and_expired(object)
{options, votes_count} = options_and_votes_count(options)
{voted, own_votes} = voted_and_own_votes(params, options)
%{
# Mastodon uses separate ids for polls, but an object can't have
@ -21,7 +22,8 @@ def render("show.json", %{object: object, multiple: multiple, options: options}
votes_count: votes_count,
voters_count: voters_count(object),
options: options,
voted: voted?(params),
voted: voted,
own_votes: own_votes,
emojis: Pleroma.Web.MastodonAPI.StatusView.build_emojis(object.data["emoji"])
}
end
@ -67,12 +69,25 @@ defp voters_count(%{data: %{"voters" => [_ | _] = voters}}) do
defp voters_count(_), do: 0
defp voted?(%{object: object} = opts) do
if opts[:for] do
existing_votes = Pleroma.Web.ActivityPub.Utils.get_existing_votes(opts[:for].ap_id, object)
existing_votes != [] or opts[:for].ap_id == object.data["actor"]
defp voted_and_own_votes(%{object: object} = params, options) do
options = options |> Enum.map(fn x -> Map.get(x, :title) end)
if params[:for] do
existing_votes =
Pleroma.Web.ActivityPub.Utils.get_existing_votes(params[:for].ap_id, object)
own_votes =
for vote <- existing_votes do
data = Map.get(vote, :object) |> Map.get(:data)
Enum.find_index(options, fn x -> x == data["name"] end)
end || []
voted = existing_votes != [] or params[:for].ap_id == object.data["actor"]
{voted, own_votes}
else
false
{false, []}
end
end
end

View file

@ -44,7 +44,8 @@ test "renders a poll" do
],
voted: false,
votes_count: 0,
voters_count: 0
voters_count: 0,
own_votes: []
}
result = PollView.render("show.json", %{object: object})
@ -123,7 +124,10 @@ test "detects vote status" do
result = PollView.render("show.json", %{object: object, for: other_user})
_own_votes = result[:own_votes]
assert result[:voted] == true
assert own_votes = [1, 2]
assert Enum.at(result[:options], 1)[:votes_count] == 1
assert Enum.at(result[:options], 2)[:votes_count] == 1
end