Merge remote-tracking branch 'pleroma/develop' into poll-notification-fixes

diff --cc config/config.exs
Simple merge

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

diff --cc lib/pleroma/web/activity_pub/side_effects.ex
index 7c99c539d1141772aa0d4e7262ee53c463bbd10d,b0ec84ade17cb44309759b0de73861c114159036..dda48ea5f2e1d67d4257b1ff8d8a2f96ded26249
--- 1/lib/pleroma/web/activity_pub/side_effects.ex
--- 2/lib/pleroma/web/activity_pub/side_effects.ex
+++ b/lib/pleroma/web/activity_pub/side_effects.ex
@@@ -373,8 -436,8 +444,8 @@@ defmodule Pleroma.Web.ActivityPub.SideE
      end
    end
  
 -  def handle_object_creation(%{"type" => objtype} = object, meta)
 -      when objtype in ~w[Audio Video Question Event Article Note Page] do
 +  def handle_object_creation(%{"type" => objtype} = object, _activity, meta)
-       when objtype in ~w[Audio Video Event Article] do
++      when objtype in ~w[Audio Video Event Article Note Page] do
      with {:ok, object, meta} <- Pipeline.common_pipeline(object, meta) do
        {:ok, object, meta}
      end

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

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

diff --cc test/pleroma/web/mastodon_api/controllers/status_controller_test.exs
index 4288971c97a72c529d509871c50a2f7d59fc9cf4,d478a81ee7dfbb3a4bc2a0e580bc23a9f3bf548a..ed66d370ab3fdc59ee5cf49a1b9798d04e39a20e
--- 1/test/pleroma/web/mastodon_api/controllers/status_controller_test.exs
--- 2/test/pleroma/web/mastodon_api/controllers/status_controller_test.exs
+++ b/test/pleroma/web/mastodon_api/controllers/status_controller_test.exs
@@@ -14,8 -14,8 +14,9 @@@ defmodule Pleroma.Web.MastodonAPI.Statu
    alias Pleroma.Tests.ObanHelpers
    alias Pleroma.User
    alias Pleroma.Web.ActivityPub.ActivityPub
+   alias Pleroma.Web.ActivityPub.Utils
    alias Pleroma.Web.CommonAPI
 +  alias Pleroma.Workers.ScheduledActivityWorker
  
    import Pleroma.Factory
  

diff --cc test/support/factory.ex
Simple merge