aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>2021-08-09 19:10:05 +0000
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>2021-08-09 19:10:05 +0000
commitf4af74b0fca14421ae17cb53a54ca91d3b519c26 (patch)
treef5504b8b06fb860151d55c03b0a6321514a585ef
parent901204df2292419378a486a97fea9d3c70903a20 (diff)
parentee5def34da66475bfd51a94ec729954c70f37337 (diff)
downloadpleroma-f4af74b0fca14421ae17cb53a54ca91d3b519c26.tar.gz
Merge branch 'fix/streaming-api-for-create-activity' into 'develop'
fix: stream out Create Activity Closes #2691 See merge request pleroma/pleroma!3499
-rw-r--r--lib/pleroma/web/activity_pub/side_effects.ex7
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/pleroma/web/activity_pub/side_effects.ex b/lib/pleroma/web/activity_pub/side_effects.ex
index dda48ea5f..701181a14 100644
--- a/lib/pleroma/web/activity_pub/side_effects.ex
+++ b/lib/pleroma/web/activity_pub/side_effects.ex
@@ -10,7 +10,6 @@ defmodule Pleroma.Web.ActivityPub.SideEffects do
collection, and so on.
"""
alias Pleroma.Activity
- alias Pleroma.Activity.Ir.Topics
alias Pleroma.Chat
alias Pleroma.Chat.MessageReference
alias Pleroma.FollowingRelationship
@@ -226,6 +225,8 @@ defmodule Pleroma.Web.ActivityPub.SideEffects do
meta
|> add_notifications(notifications)
+ ap_streamer().stream_out(activity)
+
{:ok, activity, meta}
else
e -> Repo.rollback(e)
@@ -246,9 +247,7 @@ defmodule Pleroma.Web.ActivityPub.SideEffects do
if !User.is_internal_user?(user) do
Notification.create_notifications(object)
- object
- |> Topics.get_activity_topics()
- |> Streamer.stream(object)
+ ap_streamer().stream_out(object)
end
{:ok, object, meta}