Commit 440b459c authored by lain's avatar lain

Merge branch 'bugfix/announce-timeline-flooding' into 'develop'

activitypub: filter destination list for announce activities differently than normal (closes #164)

Closes #164

See merge request pleroma/pleroma!227
parents 63094cfd 7e0f62ac
...@@ -457,13 +457,29 @@ defmodule Pleroma.User do ...@@ -457,13 +457,29 @@ defmodule Pleroma.User do
update_and_set_cache(cs) update_and_set_cache(cs)
end end
def get_notified_from_activity_query(to) do
from(
u in User,
where: u.ap_id in ^to,
where: u.local == true
)
end
def get_notified_from_activity(%Activity{recipients: to, data: %{"type" => "Announce"} = data}) do
object = Object.normalize(data["object"])
# ensure that the actor who published the announced object appears only once
to =
(to ++ [object.data["actor"]])
|> Enum.uniq()
query = get_notified_from_activity_query(to)
Repo.all(query)
end
def get_notified_from_activity(%Activity{recipients: to}) do def get_notified_from_activity(%Activity{recipients: to}) do
query = query = get_notified_from_activity_query(to)
from(
u in User,
where: u.ap_id in ^to,
where: u.local == true
)
Repo.all(query) Repo.all(query)
end end
......
...@@ -12,6 +12,24 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do ...@@ -12,6 +12,24 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
@instance Application.get_env(:pleroma, :instance) @instance Application.get_env(:pleroma, :instance)
# For Announce activities, we filter the recipients based on following status for any actors
# that match actual users. See issue #164 for more information about why this is necessary.
def get_recipients(%{"type" => "Announce"} = data) do
recipients = (data["to"] || []) ++ (data["cc"] || [])
actor = User.get_cached_by_ap_id(data["actor"])
recipients
|> Enum.filter(fn recipient ->
case User.get_cached_by_ap_id(recipient) do
nil ->
true
user ->
User.following?(user, actor)
end
end)
end
def get_recipients(data) do def get_recipients(data) do
(data["to"] || []) ++ (data["cc"] || []) (data["to"] || []) ++ (data["cc"] || [])
end end
......
...@@ -184,7 +184,10 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenter do ...@@ -184,7 +184,10 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenter do
retweeted_xml = to_simple_form(retweeted_activity, retweeted_user, true) retweeted_xml = to_simple_form(retweeted_activity, retweeted_user, true)
mentions = activity.recipients |> get_mentions mentions =
([retweeted_user.ap_id] ++ activity.recipients)
|> Enum.uniq()
|> get_mentions()
[ [
{:"activity:object-type", ['http://activitystrea.ms/schema/1.0/activity']}, {:"activity:object-type", ['http://activitystrea.ms/schema/1.0/activity']},
......
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