Ostatus: Use all recipients as mentions.
authorlain <lain@soykaf.club>
Mon, 19 Feb 2018 07:34:55 +0000 (08:34 +0100)
committerlain <lain@soykaf.club>
Mon, 19 Feb 2018 07:34:55 +0000 (08:34 +0100)
lib/pleroma/web/ostatus/activity_representer.ex

index aa2b1df39784e187cf0d3df06937ee792db76689..33e5e000990ea893f463cbc09579b1bc2556548b 100644 (file)
@@ -76,7 +76,7 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenter do
 
     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 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenter do
 
     _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 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenter do
 
     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 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenter do
 
     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 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenter do
     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']},