Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/delete...

diff --cc lib/pleroma/user.ex
Simple merge

diff --cc lib/pleroma/web/activity_pub/activity_pub_controller.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 test/tasks/user_test.exs
index ab56f07c128e890e9dd2e756b437afbcbd5f30a8,0f6ffb2b1d49a73011751289bc708851f22512e3..e0fee729017bdb365fdb0d2fcda27421d12b5788
--- 1/test/tasks/user_test.exs
--- 2/test/tasks/user_test.exs
+++ b/test/tasks/user_test.exs
@@@ -90,17 -87,12 +90,17 @@@ defmodule Mix.Tasks.Pleroma.UserTest d
      test "user is deleted" do
        user = insert(:user)
  
 -      Mix.Tasks.Pleroma.User.run(["rm", user.nickname])
 +      with_mock Pleroma.Web.Federator,
 +        publish: fn _ -> nil end do
 +        Mix.Tasks.Pleroma.User.run(["rm", user.nickname])
 +        ObanHelpers.perform_all()
  
 -      assert_received {:mix_shell, :info, [message]}
 -      assert message =~ " deleted"
 +        assert_received {:mix_shell, :info, [message]}
 +        assert message =~ " deleted"
-         refute User.get_by_nickname(user.nickname)
++        assert %{deactivated: true} = User.get_by_nickname(user.nickname)
  
 -      assert %{deactivated: true} = User.get_by_nickname(user.nickname)
 +        assert called(Pleroma.Web.Federator.publish(:_))
 +      end
      end
  
      test "no user to delete" do

diff --cc test/user_test.exs
Simple merge

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

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

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