summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Pitcock <nenolod@dereferenced.org>2018-11-08 18:55:50 +0000
committerWilliam Pitcock <nenolod@dereferenced.org>2018-11-08 18:58:24 +0000
commit144dc048b8c5f71b41f9f14b6cc4315de4dca707 (patch)
treebc5769446cce8fd4dd41f1e0de0d72ff08941933
parenta44d87f0594ad10809afe269e20e8d4c777b5d5c (diff)
downloadpleroma-144dc048b8c5f71b41f9f14b6cc4315de4dca707.tar.gz
pleroma-144dc048b8c5f71b41f9f14b6cc4315de4dca707.zip
user: only consider `to` recipients as mention targets
-rw-r--r--lib/pleroma/user.ex6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index b2f59ab6b..0d11101a3 100644
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -472,7 +472,7 @@ defmodule Pleroma.User do
)
end
- def get_notified_from_activity(%Activity{recipients: to, data: %{"type" => "Announce"} = data}) do
+ def get_notified_from_activity(%Activity{data: %{"type" => "Announce", "to" => to} = data}) do
object = Object.normalize(data["object"])
actor = User.get_cached_by_ap_id(data["actor"])
@@ -490,12 +490,14 @@ defmodule Pleroma.User do
Repo.all(query)
end
- def get_notified_from_activity(%Activity{recipients: to}) do
+ def get_notified_from_activity(%Activity{data: %{"to" => to}}) do
query = get_notified_from_activity_query(to)
Repo.all(query)
end
+ def get_notified_from_activity(_), do: []
+
def get_recipients_from_activity(%Activity{recipients: to}) do
query =
from(