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

Ingestion Pipeline Revamp

See merge request pleroma/pleroma!2315

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

diff --cc lib/pleroma/web/activity_pub/transmogrifier.ex
Simple merge

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

diff --cc lib/pleroma/web/mastodon_api/controllers/status_controller.ex
Simple merge

diff --cc test/notification_test.exs
index 7cfa40c5178d5e4798b4628ac25ebb83493b4de6,b22c238613d44b8741def1e047aca6dde3ecc665..837a9dacd17a9ea854878580817ebd4a39515430
--- 1/test/notification_test.exs
--- 2/test/notification_test.exs
+++ b/test/notification_test.exs
@@@ -537,12 -455,9 +537,12 @@@ defmodule Pleroma.NotificationTest d
            "status" => "hey @#{other_user.nickname}!"
          })
  
-       {:ok, activity_two, _} = CommonAPI.favorite(activity_one.id, third_user)
+       {:ok, activity_two} = CommonAPI.favorite(third_user, activity_one.id)
  
 -      assert other_user not in Notification.get_notified_from_activity(activity_two)
 +      {enabled_receivers, _disabled_receivers} =
 +        Notification.get_notified_from_activity(activity_two)
 +
 +      assert other_user not in enabled_receivers
      end
  
      test "it does not send notification to mentioned users in announces" do

diff --cc test/object_test.exs
Simple merge

diff --cc test/user_test.exs
Simple merge

diff --cc test/web/activity_pub/activity_pub_test.exs
Simple merge

diff --cc test/web/activity_pub/transmogrifier_test.exs
Simple merge

diff --cc test/web/activity_pub/views/object_view_test.exs
Simple merge

diff --cc test/web/common_api/common_api_test.exs
Simple merge

diff --cc test/web/mastodon_api/controllers/notification_controller_test.exs
Simple merge

diff --cc test/web/mastodon_api/controllers/status_controller_test.exs
Simple merge

diff --cc test/web/mastodon_api/views/notification_view_test.exs
Simple merge

diff --cc test/web/ostatus/ostatus_controller_test.exs
Simple merge

diff --cc test/web/pleroma_api/controllers/account_controller_test.exs
Simple merge

diff --cc test/web/push/impl_test.exs
Simple merge

diff --cc test/web/streamer/streamer_test.exs
Simple merge