Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms

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/common_api/utils.ex
Simple merge

diff --cc lib/pleroma/web/mastodon_api/views/account_view.ex
Simple merge

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

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

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

diff --cc test/web/mastodon_api/controllers/timeline_controller_test.exs
index a5c227991ebb0cf6eba00e30184d3f991946adcd,f8b9289f37cb04c7d893e667ea3d8d7b152a9efd..237d7daa5f3df59feb512542860a6521934da9dc
--- 1/test/web/mastodon_api/controllers/timeline_controller_test.exs
--- 2/test/web/mastodon_api/controllers/timeline_controller_test.exs
+++ b/test/web/mastodon_api/controllers/timeline_controller_test.exs
@@@ -47,16 -47,13 +47,16 @@@ defmodule Pleroma.Web.MastodonAPI.Timel
        following = insert(:user, nickname: "followed")
        third_user = insert(:user, nickname: "repeated")
  
-       {:ok, _activity} = CommonAPI.post(following, %{"status" => "post"})
-       {:ok, activity} = CommonAPI.post(third_user, %{"status" => "repeated post"})
+       {:ok, _activity} = CommonAPI.post(following, %{status: "post"})
+       {:ok, activity} = CommonAPI.post(third_user, %{status: "repeated post"})
        {:ok, _, _} = CommonAPI.repeat(activity.id, following)
  
 +      # This one should not show up in the TL
 +      {:ok, _activity} = CommonAPI.post_chat_message(third_user, user, ":gun:")
 +
        ret_conn = get(conn, uri)
  
-       assert Enum.empty?(json_response(ret_conn, :ok))
+       assert Enum.empty?(json_response_and_validate_schema(ret_conn, :ok))
  
        {:ok, _user} = User.follow(user, following)
  

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

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