X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Factivity_pub%2Fside_effects.ex;h=91e9c72e03b408867cb3b3f995a6da57638f6aa0;hb=144c06487a9c6cdbff1d09ba0d93c8fa5a7789a2;hp=dda48ea5f2e1d67d4257b1ff8d8a2f96ded26249;hpb=901204df2292419378a486a97fea9d3c70903a20;p=akkoma diff --git a/lib/pleroma/web/activity_pub/side_effects.ex b/lib/pleroma/web/activity_pub/side_effects.ex index dda48ea5f..91e9c72e0 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} @@ -538,6 +537,18 @@ defmodule Pleroma.Web.ActivityPub.SideEffects do end @impl true + def handle_after_transaction(%Pleroma.Activity{data: %{"type" => "Create"}} = activity) do + Pleroma.Elasticsearch.put_by_id(activity.id) + end + + def handle_after_transaction(%Pleroma.Activity{}) do + :ok + end + + def handle_after_transaction(%Pleroma.Object{}) do + :ok + end + def handle_after_transaction(meta) do meta |> send_notifications()