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/tasks/database_test.exs
+++ b/test/tasks/database_test.exs
@ -102,7 +102,7 @@ defmodule Mix.Tasks.Pleroma.DatabaseTest do
      {:ok, %{id: id, object: object}} = CommonAPI.post(user, %{"status" => "test"})
      {:ok, %{object: object2}} = CommonAPI.post(user, %{"status" => "test test"})

-      CommonAPI.favorite(id, user2)
+      CommonAPI.favorite(user2, id)

      likes = %{
        "first" =>