From: Roman Chvanikov <chvanikoff@pm.me>
Date: Mon, 16 Sep 2019 17:30:42 +0000 (+0300)
Subject: Merge develop
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=76c3e290fcb211ba21bf78711d832edbfc8f8979;p=akkoma

Merge develop
---

76c3e290fcb211ba21bf78711d832edbfc8f8979
diff --cc lib/pleroma/web/activity_pub/activity_pub.ex
index bc9a7a2d6,bc5ae7fbf..eac0b5a99
--- a/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 test/web/mastodon_api/mastodon_api_controller_test.exs
index 27a8366f7,fb04748bb..1d2d9e134
--- a/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