Merge branch 'develop' into feature/admin-api-user-statuses

diff --cc CHANGELOG.md
Simple merge

diff --cc docs/api/admin_api.md
Simple merge

diff --cc lib/pleroma/web/admin_api/admin_api_controller.ex
Simple merge

diff --cc lib/pleroma/web/router.ex
Simple merge

diff --cc test/support/factory.ex
index d02bd9212ccb74f969bf1bcfd486c22f7d2fef51,1f4239213cadc877ed181782013f318f60826cf5..c751546ce46bbf4edc6aedd14b824b29f4f3286c
--- 1/test/support/factory.ex
--- 2/test/support/factory.ex
+++ b/test/support/factory.ex
@@@ -118,18 -118,20 +118,21 @@@ defmodule Pleroma.Factory d
    def note_activity_factory(attrs \\ %{}) do
      user = attrs[:user] || insert(:user)
      note = attrs[:note] || insert(:note, user: user)
-     published = attrs[:published] || DateTime.utc_now() |> DateTime.to_iso8601()
-     attrs = Map.drop(attrs, [:user, :note])
 +
-     data = %{
-       "id" => Pleroma.Web.ActivityPub.Utils.generate_activity_id(),
-       "type" => "Create",
-       "actor" => note.data["actor"],
-       "to" => note.data["to"],
-       "object" => note.data["id"],
-       "published" => published,
-       "context" => note.data["context"]
-     }
+     data_attrs = attrs[:data_attrs] || %{}
+     attrs = Map.drop(attrs, [:user, :note, :data_attrs])
+ 
+     data =
+       %{
+         "id" => Pleroma.Web.ActivityPub.Utils.generate_activity_id(),
+         "type" => "Create",
+         "actor" => note.data["actor"],
+         "to" => note.data["to"],
+         "object" => note.data["id"],
+         "published" => DateTime.utc_now() |> DateTime.to_iso8601(),
+         "context" => note.data["context"]
+       }
+       |> Map.merge(data_attrs)
  
      %Pleroma.Activity{
        data: data,

diff --cc test/web/admin_api/admin_api_controller_test.exs
Simple merge