Merge develop

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

diff --cc lib/pleroma/web/activity_pub/activity_pub.ex
index bc9a7a2d6cae9c445e1b1a8caf2f34b64cb867cc,bc5ae7fbf92194943344b055422d39ef3d6d7996..eac0b5a9933c2c14cbf84749e278eac0e5da25d8
--- 1/lib/pleroma/web/activity_pub/activity_pub.ex
--- 2/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@@ -146,10 -148,9 +149,10 @@@ defmodule Pleroma.Web.ActivityPub.Activ
            activity
          end
  
-       PleromaJobQueue.enqueue(:background, Pleroma.Web.RichMedia.Helpers, [:fetch, activity])
+       BackgroundWorker.enqueue("fetch_data_for_activity", %{"activity_id" => activity.id})
  
        Notification.create_notifications(activity)
 +      SubscriptionNotification.create_notifications(activity)
  
        participations =
          activity

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

diff --cc test/notification_test.exs
Simple merge

diff --cc test/web/mastodon_api/mastodon_api_controller_test.exs
index 27a8366f7e39b26fd8fdc9c26dca6958588d8486,fb04748bb447d04e4f9b6790a53ad4d28a760949..1d2d9e1349caa52b42d733c88e0a6f8046f1d4a1
--- 1/test/web/mastodon_api/mastodon_api_controller_test.exs
--- 2/test/web/mastodon_api/mastodon_api_controller_test.exs
+++ b/test/web/mastodon_api/mastodon_api_controller_test.exs
@@@ -13,7 -13,7 +13,8 @@@ defmodule Pleroma.Web.MastodonAPI.Masto
    alias Pleroma.Object
    alias Pleroma.Repo
    alias Pleroma.ScheduledActivity
 +  alias Pleroma.SubscriptionNotification
+   alias Pleroma.Tests.ObanHelpers
    alias Pleroma.User
    alias Pleroma.Web.ActivityPub.ActivityPub
    alias Pleroma.Web.CommonAPI