Merge branch 'develop' into issue/1383

2020-01-27 08:48:19 +03:00 · 2020-01-27 08:48:19 +03:00 · bfc70fdf29
commit bfc70fdf29
parent 8589632d09 36838b516f
23 changed files with 401 additions and 245 deletions
--- a/test/web/mastodon_api/views/status_view_test.exs
+++ b/test/web/mastodon_api/views/status_view_test.exs
@ -36,7 +36,10 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
    activity = Repo.get(Activity, activity.id)
    status = StatusView.render("show.json", activity: activity)

-    assert status[:pleroma][:emoji_reactions] == [["☕", 2], ["🍵", 1]]
+    assert status[:pleroma][:emoji_reactions] == [
+             %{emoji: "☕", count: 2},
+             %{emoji: "🍵", count: 1}
+           ]
  end

  test "loads and returns the direct conversation id when given the `with_direct_conversation_id` option" do