From: Alex Gleason <alex@alexgleason.me>
Date: Sun, 18 Jul 2021 16:36:41 +0000 (-0500)
Subject: Merge remote-tracking branch 'pleroma/develop' into poll-notification-fixes
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=62bf6d67e393d2b290d226e8505d622d944c9a26;p=akkoma

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

62bf6d67e393d2b290d226e8505d622d944c9a26
diff --cc lib/pleroma/web/activity_pub/side_effects.ex
index 7c99c539d,b0ec84ade..dda48ea5f
--- a/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/web/mastodon_api/controllers/status_controller_test.exs
index 4288971c9,d478a81ee..ed66d370a
--- a/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