sjw/pleroma
1
0
Fork 0
mirror of https://git.pleroma.social/sjw/pleroma.git synced 2024-12-28 14:35:21 +01:00
Code Issues Releases Wiki Activity

user: add optional local_only param to get_notified_from_activity()

Browse Source
This commit is contained in:
William Pitcock 2018-11-08 19:30:55 +00:00
parent 719a8a1f82
commit 0a2c1a3419
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/pleroma/user.ex
View File

@ -464,15 +464,25 @@ defmodule Pleroma.User do
update_and_set_cache(cs)
end
def get_notified_from_activity_query(to) do
def get_notified_from_activity_query(to, false) do
from(
u in User,
where: u.ap_id in ^to,
where: u.ap_id in ^to
)
end
def get_notified_from_activity_query(to, true) do
query = get_notified_from_activity_query(to, false)
from(
u in query,
where: u.local == true
)
end
def get_notified_from_activity(%Activity{data: %{"type" => "Announce", "to" => to} = data}) do
def get_notified_from_activity(activity, local_only \\ true)
def get_notified_from_activity(%Activity{data: %{"type" => "Announce", "to" => to} = data}, local_only) do
object = Object.normalize(data["object"])
actor = User.get_cached_by_ap_id(data["actor"])
@ -485,18 +495,18 @@ defmodule Pleroma.User do
end
|> Enum.uniq()
query = get_notified_from_activity_query(to)
query = get_notified_from_activity_query(to, local_only)
Repo.all(query)
end
def get_notified_from_activity(%Activity{data: %{"to" => to}}) do
query = get_notified_from_activity_query(to)
def get_notified_from_activity(%Activity{data: %{"to" => to}}, local_only) do
query = get_notified_from_activity_query(to, local_only)
Repo.all(query)
end
def get_notified_from_activity(_), do: []
def get_notified_from_activity(_, _), do: []
def get_recipients_from_activity(%Activity{recipients: to}) do
query =