From 313f186a66fd89bda36c684a926d3118a489064a Mon Sep 17 00:00:00 2001 From: lain Date: Mon, 19 Feb 2018 08:34:55 +0100 Subject: [PATCH] Ostatus: Use all recipients as mentions. --- lib/pleroma/web/ostatus/activity_representer.ex | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/pleroma/web/ostatus/activity_representer.ex b/lib/pleroma/web/ostatus/activity_representer.ex index aa2b1df39..33e5e0009 100644 --- a/lib/pleroma/web/ostatus/activity_representer.ex +++ b/lib/pleroma/web/ostatus/activity_representer.ex @@ -76,7 +76,7 @@ def to_simple_form(%{data: %{"object" => %{"type" => "Note"}}} = activity, user, in_reply_to = get_in_reply_to(activity.data) author = if with_author, do: [{:author, UserRepresenter.to_simple_form(user)}], else: [] - mentions = activity.data["to"] |> get_mentions + mentions = activity.recipients |> get_mentions categories = (activity.data["object"]["tag"] || []) |> Enum.map(fn (tag) -> {:category, [term: to_charlist(tag)], []} end) @@ -110,7 +110,7 @@ def to_simple_form(%{data: %{"type" => "Like"}} = activity, user, with_author) d _in_reply_to = get_in_reply_to(activity.data) author = if with_author, do: [{:author, UserRepresenter.to_simple_form(user)}], else: [] - mentions = activity.data["to"] |> get_mentions + mentions = activity.recipients |> get_mentions [ {:"activity:verb", ['http://activitystrea.ms/schema/1.0/favorite']}, @@ -144,7 +144,7 @@ def to_simple_form(%{data: %{"type" => "Announce"}} = activity, user, with_autho retweeted_xml = to_simple_form(retweeted_activity, retweeted_user, true) - mentions = activity.data["to"] |> get_mentions + mentions = activity.recipients |> get_mentions [ {:"activity:object-type", ['http://activitystrea.ms/schema/1.0/activity']}, {:"activity:verb", ['http://activitystrea.ms/schema/1.0/share']}, @@ -168,7 +168,7 @@ def to_simple_form(%{data: %{"type" => "Follow"}} = activity, user, with_author) author = if with_author, do: [{:author, UserRepresenter.to_simple_form(user)}], else: [] - mentions = (activity.data["to"] || []) |> get_mentions + mentions = (activity.recipients || []) |> get_mentions [ {:"activity:object-type", ['http://activitystrea.ms/schema/1.0/activity']}, {:"activity:verb", ['http://activitystrea.ms/schema/1.0/follow']}, @@ -196,7 +196,7 @@ def to_simple_form(%{data: %{"type" => "Undo"}} = activity, user, with_author) d author = if with_author, do: [{:author, UserRepresenter.to_simple_form(user)}], else: [] follow_activity = Activity.get_by_ap_id(activity.data["object"]) - mentions = (activity.data["to"] || []) |> get_mentions + mentions = (activity.recipients || []) |> get_mentions [ {:"activity:object-type", ['http://activitystrea.ms/schema/1.0/activity']}, {:"activity:verb", ['http://activitystrea.ms/schema/1.0/unfollow']},