diff options
| -rw-r--r-- | lib/pleroma/web/ostatus/activity_representer.ex | 8 | ||||
| -rw-r--r-- | test/web/ostatus/activity_representer_test.exs | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/lib/pleroma/web/ostatus/activity_representer.ex b/lib/pleroma/web/ostatus/activity_representer.ex index 2092ab7fa..2bff57e76 100644 --- a/lib/pleroma/web/ostatus/activity_representer.ex +++ b/lib/pleroma/web/ostatus/activity_representer.ex @@ -83,6 +83,12 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenter do emoji_links = get_emoji_links(activity.data["object"]["content"] || "") + summary = if activity.data["object"]["summary"] do + [{:summary, [], h.(activity.data["object"]["summary"])}] + else + [] + end + [ {:"activity:object-type", ['http://activitystrea.ms/schema/1.0/note']}, {:"activity:verb", ['http://activitystrea.ms/schema/1.0/post']}, @@ -93,7 +99,7 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenter do {:updated, h.(updated_at)}, {:"ostatus:conversation", [ref: h.(activity.data["context"])], h.(activity.data["context"])}, {:link, [ref: h.(activity.data["context"]), rel: 'ostatus:conversation'], []}, - ] ++ get_links(activity) ++ categories ++ attachments ++ in_reply_to ++ author ++ mentions ++ emoji_links + ] ++ summary ++ get_links(activity) ++ categories ++ attachments ++ in_reply_to ++ author ++ mentions ++ emoji_links end def to_simple_form(%{data: %{"type" => "Like"}} = activity, user, with_author) do diff --git a/test/web/ostatus/activity_representer_test.exs b/test/web/ostatus/activity_representer_test.exs index 8a0121b37..0d83ad964 100644 --- a/test/web/ostatus/activity_representer_test.exs +++ b/test/web/ostatus/activity_representer_test.exs @@ -36,6 +36,7 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do <updated>#{note_activity.data["object"]["published"]}</updated> <ostatus:conversation ref="#{note_activity.data["context"]}">#{note_activity.data["context"]}</ostatus:conversation> <link ref="#{note_activity.data["context"]}" rel="ostatus:conversation" /> + <summary>#{note_activity.data["object"]["summary"]}</summary> <link type="application/atom+xml" href="#{note_activity.data["object"]["id"]}" rel="self" /> <link type="text/html" href="#{note_activity.data["object"]["id"]}" rel="alternate" /> <category term="2hu"/> @@ -74,6 +75,7 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do <updated>#{answer.data["object"]["published"]}</updated> <ostatus:conversation ref="#{answer.data["context"]}">#{answer.data["context"]}</ostatus:conversation> <link ref="#{answer.data["context"]}" rel="ostatus:conversation" /> + <summary>2hu</summary> <link type="application/atom+xml" href="#{answer.data["object"]["id"]}" rel="self" /> <link type="text/html" href="#{answer.data["object"]["id"]}" rel="alternate" /> <category term="2hu"/> |