Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags...

diff --cc lib/mix/tasks/pleroma/database.ex
Simple merge

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

diff --cc lib/pleroma/activity/ir/topics.ex
Simple merge

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

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

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

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

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

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

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

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

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

diff --cc lib/pleroma/web/feed/feed_view.ex
Simple merge

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

diff --cc test/pleroma/activity/ir/topics_test.exs
Simple merge

diff --cc test/pleroma/object_test.exs
Simple merge

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

diff --cc test/pleroma/web/activity_pub/transmogrifier/note_handling_test.exs
index a33959d9fa8c606e4b3b78fe55194cfff89fe12a,108f27ef726b5614537b2322db335601bb6a3263..50bf619a73fb1c9928896e477204037bc4449257
--- 1/test/pleroma/web/activity_pub/transmogrifier/note_handling_test.exs
--- 2/test/pleroma/web/activity_pub/transmogrifier/note_handling_test.exs
+++ b/test/pleroma/web/activity_pub/transmogrifier/note_handling_test.exs
@@@ -37,10 -37,9 +37,10 @@@ defmodule Pleroma.Web.ActivityPub.Trans
        data = File.read!("test/fixtures/kroeg-array-less-hashtag.json") |> Jason.decode!()
  
        {:ok, %Activity{data: data, local: false}} = Transmogrifier.handle_incoming(data)
-       object = Object.normalize(data["object"])
+       object = Object.normalize(data["object"], fetch: false)
  
 -      assert "test" in object.data["tag"]
 +      assert "test" in Object.tags(object)
 +      assert Object.hashtags(object) == ["test"]
      end
  
      test "it cleans up incoming notices which are not really DMs" do
@@@ -219,10 -218,9 +219,10 @@@
        data = File.read!("test/fixtures/mastodon-post-activity-hashtag.json") |> Jason.decode!()
  
        {:ok, %Activity{data: data, local: false}} = Transmogrifier.handle_incoming(data)
-       object = Object.normalize(data["object"])
+       object = Object.normalize(data["object"], fetch: false)
  
 -      assert Enum.at(object.data["tag"], 2) == "moo"
 +      assert Enum.at(Object.tags(object), 2) == "moo"
 +      assert Object.hashtags(object) == ["moo"]
      end
  
      test "it works for incoming notices with contentMap" do

diff --cc test/pleroma/web/common_api_test.exs
index 1e98208fb8d996b3268bf0ec7da3de71b9c4a57d,2ece9280663e406fb6c7b29c8bccf09f1c4053b6..209fa86f6cae5c4742ad435442d67d9c33aeed18
--- 1/test/pleroma/web/common_api_test.exs
--- 2/test/pleroma/web/common_api_test.exs
+++ b/test/pleroma/web/common_api_test.exs
@@@ -491,9 -491,9 +491,9 @@@ defmodule Pleroma.Web.CommonAPITest d
      user = insert(:user)
      {:ok, activity} = CommonAPI.post(user, %{status: "#2hu #2HU"})
  
-     object = Object.normalize(activity)
+     object = Object.normalize(activity, fetch: false)
  
 -    assert object.data["tag"] == ["2hu"]
 +    assert Object.tags(object) == ["2hu"]
    end
  
    test "it adds emoji in the object" do

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