Commit 9c09ea01 authored by Haelwenn's avatar Haelwenn
Browse files

Merge branch '2284-voters-count' into 'develop'

Always return voters_count in polls

See merge request !3120
parents bc4d9c4f 92d252f3
Pipeline #32555 passed with stages
in 96 minutes and 29 seconds
......@@ -30,6 +30,7 @@ The format is based on [Keep a Changelog](
- Users with the `discoverable` field set to false will not show up in searches.
- Minimum lifetime for ephmeral activities changed to 10 minutes and made configurable (`:min_lifetime` option).
- Introduced optional dependencies on `ffmpeg`, `ImageMagick`, `exiftool` software packages. Please refer to `docs/installation/optional/`.
- Polls now always return a `voters_count`, even if they are single-choice
<summary>API Changes</summary>
......@@ -28,8 +28,11 @@ defmodule Pleroma.Web.ApiSpec.Schemas.Poll do
votes_count: %Schema{
type: :integer,
nullable: true,
description: "How many votes have been received. Number, or null if `multiple` is false."
description: "How many votes have been received. Number."
voters_count: %Schema{
type: :integer,
description: "How many unique accounts have voted. Number."
voted: %Schema{
type: :boolean,
......@@ -61,7 +64,7 @@ defmodule Pleroma.Web.ApiSpec.Schemas.Poll do
expired: true,
multiple: false,
votes_count: 10,
voters_count: nil,
voters_count: 10,
voted: true,
own_votes: [
......@@ -19,7 +19,7 @@ def render("show.json", %{object: object, multiple: multiple, options: options}
expired: expired,
multiple: multiple,
votes_count: votes_count,
voters_count: (multiple || nil) && voters_count(object),
voters_count: voters_count(object),
options: options,
voted: voted?(params),
emojis: Pleroma.Web.MastodonAPI.StatusView.build_emojis(["emoji"])
......@@ -44,7 +44,7 @@ test "renders a poll" do
voted: false,
votes_count: 0,
voters_count: nil
voters_count: 0
result = PollView.render("show.json", %{object: object})
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment