Merge branch 'remake-remodel-2' into 'develop'

Ingestion Pipeline Revamp See merge request pleroma/pleroma!2315
2020-04-06 11:59:01 +00:00 · 2020-04-06 11:59:01 +00:00 · 349b9d86dc
commit 349b9d86dc
parent 8444e7ee96 772bc258cd
38 changed files with 915 additions and 88 deletions
--- a/test/web/activity_pub/views/object_view_test.exs
+++ b/test/web/activity_pub/views/object_view_test.exs
@ -59,7 +59,7 @@ defmodule Pleroma.Web.ActivityPub.ObjectViewTest do
    object = Object.normalize(note)
    user = insert(:user)

-    {:ok, like_activity, _} = CommonAPI.favorite(note.id, user)
+    {:ok, like_activity} = CommonAPI.favorite(user, note.id)

    result = ObjectView.render("object.json", %{object: like_activity})