Merge branch 'remake-remodel' into develop

2020-03-19 18:00:55 +01:00 · 2020-03-19 18:00:55 +01:00 · 3c2c32b460
commit 3c2c32b460
parent ac5c2b66b9 d4bafabfd1
36 changed files with 862 additions and 85 deletions
--- a/test/web/activity_pub/views/object_view_test.exs
+++ b/test/web/activity_pub/views/object_view_test.exs
@ -61,7 +61,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})