projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "Merge branch 'streamer-refactoring' into 'develop'"
[akkoma]
/
lib
/
pleroma
/
web
/
activity_pub
/
activity_pub.ex
diff --git
a/lib/pleroma/web/activity_pub/activity_pub.ex
b/lib/pleroma/web/activity_pub/activity_pub.ex
index eeb826814423c620a3dc0e341093d00bccc7ab8e..41f6a0f1f79fde06025d6c14adfe71cb4f4f6f91 100644
(file)
--- a/
lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/
lib/pleroma/web/activity_pub/activity_pub.ex
@@
-17,6
+17,7
@@
defmodule Pleroma.Web.ActivityPub.ActivityPub do
alias Pleroma.Web.ActivityPub.MRF
alias Pleroma.Web.ActivityPub.Transmogrifier
alias Pleroma.Web.WebFinger
alias Pleroma.Web.ActivityPub.MRF
alias Pleroma.Web.ActivityPub.Transmogrifier
alias Pleroma.Web.WebFinger
+ alias Pleroma.Workers.BackgroundWorker
import Ecto.Query
import Pleroma.Web.ActivityPub.Utils
import Ecto.Query
import Pleroma.Web.ActivityPub.Utils
@@
-145,7
+146,7
@@
defmodule Pleroma.Web.ActivityPub.ActivityPub do
activity
end
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)
Notification.create_notifications(activity)
@@
-796,7
+797,7
@@
defmodule Pleroma.Web.ActivityPub.ActivityPub do
)
unless opts["skip_preload"] do
)
unless opts["skip_preload"] do
- from([thread_mute: tm] in query, where: is_nil(tm))
+ from([thread_mute: tm] in query, where: is_nil(tm
.user_id
))
else
query
end
else
query
end