Handle voters count correctly

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>

lib/pleroma/constants.ex

@@ -22,7 +22,8 @@ defmodule Pleroma.Constants do
       "generator",
       "assigned_account",
       "rules",
-      "content_type"
+      "content_type",
+      "voters"
     ]
   )
 

lib/pleroma/web/activity_pub/object_validators/question_validator.ex

@@ -29,6 +29,7 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.QuestionValidator do
 
     field(:closed, ObjectValidators.DateTime)
     field(:voters, {:array, ObjectValidators.ObjectID}, default: [])
+    field(:votersCount, :integer)
     field(:nonAnonymous, :boolean)
     embeds_many(:anyOf, QuestionOptionsValidator)
     embeds_many(:oneOf, QuestionOptionsValidator)

lib/pleroma/web/activity_pub/transmogrifier.ex

@@ -723,6 +723,12 @@ def replies(%{"replies" => %{"items" => items}}) when not is_nil(items) do
 
   def replies(_), do: []
 
+  defp set_voters_count(%{"voters" => [_ | _] = voters} = obj) do
+    Map.merge(obj, %{"votersCount" => length(voters)})
+  end
+
+  defp set_voters_count(obj), do: obj
+
   # Prepares the object of an outgoing create activity.
   def prepare_object(object) do
     object
@@ -735,6 +741,7 @@ def prepare_object(object) do
     |> set_reply_to_uri
     |> set_quote_url
     |> set_replies
+    |> set_voters_count
     |> strip_internal_fields
     |> strip_internal_tags
     |> set_type

lib/pleroma/web/mastodon_api/views/poll_view.ex

@@ -71,6 +71,10 @@ defp options_and_votes_count(options) do
     end)
   end
 
+  defp voters_count(%{data: %{"votersCount" => voters}}) when is_number(voters) do
+    voters
+  end
+
   defp voters_count(%{data: %{"voters" => [_ | _] = voters}}) do
     length(voters)
   end

priv/static/schemas/litepub-0.1.jsonld

@@ -41,7 +41,8 @@
             },
             "vcard": "http://www.w3.org/2006/vcard/ns#",
             "sm": "http://smithereen.software/ns#",
-            "nonAnonymous": "sm:nonAnonymous"
+            "nonAnonymous": "sm:nonAnonymous",
+            "votersCount" : "toot:votersCount"
         }
     ]
 }