Verified Commit 34606d60 authored by kPherox's avatar kPherox Committed by Haelwenn
Browse files

fix: stream out Create Activity

Backport of: !3499
parent dc63aaf8
...@@ -14,7 +14,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ...@@ -14,7 +14,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
### Removed ### Removed
## 2.4.0 - 2021-08-xx ## 2.4.1
### Fixed
- MastodonAPI: Stream out Create activities
## 2.4.0 - 2021-08-08
### Changed ### Changed
......
...@@ -10,7 +10,6 @@ defmodule Pleroma.Web.ActivityPub.SideEffects do ...@@ -10,7 +10,6 @@ defmodule Pleroma.Web.ActivityPub.SideEffects do
collection, and so on. collection, and so on.
""" """
alias Pleroma.Activity alias Pleroma.Activity
alias Pleroma.Activity.Ir.Topics
alias Pleroma.Chat alias Pleroma.Chat
alias Pleroma.Chat.MessageReference alias Pleroma.Chat.MessageReference
alias Pleroma.FollowingRelationship alias Pleroma.FollowingRelationship
...@@ -225,6 +224,8 @@ def handle(%{data: %{"type" => "Create"}} = activity, meta) do ...@@ -225,6 +224,8 @@ def handle(%{data: %{"type" => "Create"}} = activity, meta) do
meta meta
|> add_notifications(notifications) |> add_notifications(notifications)
ap_streamer().stream_out(activity)
{:ok, activity, meta} {:ok, activity, meta}
else else
e -> Repo.rollback(e) e -> Repo.rollback(e)
...@@ -245,9 +246,7 @@ def handle(%{data: %{"type" => "Announce"}} = object, meta) do ...@@ -245,9 +246,7 @@ def handle(%{data: %{"type" => "Announce"}} = object, meta) do
if !User.is_internal_user?(user) do if !User.is_internal_user?(user) do
Notification.create_notifications(object) Notification.create_notifications(object)
object ap_streamer().stream_out(object)
|> Topics.get_activity_topics()
|> Streamer.stream(object)
end end
{:ok, object, meta} {:ok, object, meta}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment