Merge branch 'develop' into issue/1383

2020-01-22 20:20:39 +03:00 · 2020-01-22 20:20:39 +03:00 · cf19bf3c7c
commit cf19bf3c7c
parent e761d76e4f be27777156
485 changed files with 5044 additions and 1888 deletions
--- a/lib/pleroma/web/mastodon_api/views/status_view.ex
+++ b/lib/pleroma/web/mastodon_api/views/status_view.ex
@ -255,12 +255,11 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do

    emoji_reactions =
      with %{data: %{"reactions" => emoji_reactions}} <- object do
-        Enum.map(emoji_reactions, fn {emoji, users} ->
-          {emoji, length(users)}
+        Enum.map(emoji_reactions, fn [emoji, users] ->
+          [emoji, length(users)]
        end)
-        |> Enum.into(%{})
      else
-        _ -> %{}
+        _ -> []
      end

    %{