aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkPherox <admin@mail.kr-kp.com>2020-05-27 05:24:36 +0000
committerkPherox <admin@mail.kr-kp.com>2020-05-29 19:07:05 +0900
commit228ff3760efb62d4452b3025fa9e78fed164655e (patch)
treec715337e4fea177a42f1304f46dbd68d2f0b1820
parent9df5b1e6ae8357942ef85563eebaf583f1dbc19a (diff)
downloadpleroma-228ff3760efb62d4452b3025fa9e78fed164655e.tar.gz
Use `User.is_internal_user?` instead
-rw-r--r--lib/pleroma/web/activity_pub/side_effects.ex4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/web/activity_pub/side_effects.ex b/lib/pleroma/web/activity_pub/side_effects.ex
index 60ab8733d..fb6275450 100644
--- a/lib/pleroma/web/activity_pub/side_effects.ex
+++ b/lib/pleroma/web/activity_pub/side_effects.ex
@@ -11,7 +11,6 @@ defmodule Pleroma.Web.ActivityPub.SideEffects do
alias Pleroma.Repo
alias Pleroma.User
alias Pleroma.Web.ActivityPub.ActivityPub
- alias Pleroma.Web.ActivityPub.Relay
alias Pleroma.Web.ActivityPub.Utils
def handle(object, meta \\ [])
@@ -34,10 +33,11 @@ defmodule Pleroma.Web.ActivityPub.SideEffects do
# - Stream out the announce
def handle(%{data: %{"type" => "Announce"}} = object, meta) do
announced_object = Object.get_by_ap_id(object.data["object"])
+ user = User.get_cached_by_ap_id(object.data["actor"])
Utils.add_announce_to_object(object, announced_object)
- if object.data["actor"] != Relay.relay_ap_id() do
+ if !User.is_internal_user?(user) do
Notification.create_notifications(object)
ActivityPub.stream_out(object)
end