diff options
| -rw-r--r-- | lib/pleroma/notification.ex | 5 | ||||
| -rw-r--r-- | lib/pleroma/web/activity_pub/activity_pub.ex | 2 | ||||
| -rw-r--r-- | lib/pleroma/web/activity_pub/side_effects.ex | 6 | 
3 files changed, 7 insertions, 6 deletions
diff --git a/lib/pleroma/notification.ex b/lib/pleroma/notification.ex index f521a2998..de2508b93 100644 --- a/lib/pleroma/notification.ex +++ b/lib/pleroma/notification.ex @@ -757,8 +757,9 @@ defmodule Pleroma.Notification do      |> Repo.update_all(set: [seen: true])    end -  @spec send(list(Notification.t())) :: :ok -  def send(notifications) do +  @doc "Streams a list of notifications over websockets and web push" +  @spec stream(list(Notification.t())) :: :ok +  def stream(notifications) do      Enum.each(notifications, fn notification ->        Streamer.stream(["user", "user:notification"], notification)        Push.send(notification) diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex index 1247ae7ce..6c1d6ded9 100644 --- a/lib/pleroma/web/activity_pub/activity_pub.ex +++ b/lib/pleroma/web/activity_pub/activity_pub.ex @@ -201,7 +201,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do    def notify_and_stream(activity) do      {:ok, notifications} = Notification.create_notifications(activity) -    Notification.send(notifications) +    Notification.stream(notifications)      original_activity =        case activity do diff --git a/lib/pleroma/web/activity_pub/side_effects.ex b/lib/pleroma/web/activity_pub/side_effects.ex index 60b4d5f1b..2a141b0f5 100644 --- a/lib/pleroma/web/activity_pub/side_effects.ex +++ b/lib/pleroma/web/activity_pub/side_effects.ex @@ -592,9 +592,9 @@ defmodule Pleroma.Web.ActivityPub.SideEffects do      with {:ok, _} <- Repo.delete(object), do: :ok    end -  defp send_notifications(meta) do +  defp stream_notifications(meta) do      Keyword.get(meta, :notifications, []) -    |> Notification.send() +    |> Notification.stream()      meta    end @@ -625,7 +625,7 @@ defmodule Pleroma.Web.ActivityPub.SideEffects do    @impl true    def handle_after_transaction(meta) do      meta -    |> send_notifications() +    |> stream_notifications()      |> send_streamables()    end  end  | 
