moon
/
spc-pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Return object id in Ostatus create activties.

This commit is contained in:
Roger Braun 2017-04-21 04:22:02 +02:00
parent 424e0e7779
commit f51a672ac4
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/pleroma/web/ostatus/activity_representer.ex
View File

@ -1,5 +1,5 @@
defmodule Pleroma.Web.OStatus.ActivityRepresenter do defmodule Pleroma.Web.OStatus.ActivityRepresenter do
def to_simple_form(activity, user) do def to_simple_form(%{data: %{"object" => %{"type" => "Note"}}} = activity, user) do
h = fn(str) -> [to_charlist(str)] end h = fn(str) -> [to_charlist(str)] end
updated_at = activity.updated_at updated_at = activity.updated_at
@ -10,7 +10,7 @@ def to_simple_form(activity, user) do
[ [
{:"activity:object-type", ['http://activitystrea.ms/schema/1.0/note']}, {:"activity:object-type", ['http://activitystrea.ms/schema/1.0/note']},
{:"activity:verb", ['http://activitystrea.ms/schema/1.0/post']}, {:"activity:verb", ['http://activitystrea.ms/schema/1.0/post']},
{:id, h.(activity.data["id"])}, {:id, h.(activity.data["object"]["id"])},
{:title, ['New note by #{user.nickname}']}, {:title, ['New note by #{user.nickname}']},
{:content, [type: 'html'], h.(activity.data["object"]["content"])}, {:content, [type: 'html'], h.(activity.data["object"]["content"])},
{:published, h.(inserted_at)}, {:published, h.(inserted_at)},

2
test/web/ostatus/activity_representer_test.exs
View File

@ -18,7 +18,7 @@ test "a note activity" do
expected = """ expected = """
<activity:object-type>http://activitystrea.ms/schema/1.0/note</activity:object-type> <activity:object-type>http://activitystrea.ms/schema/1.0/note</activity:object-type>
<activity:verb>http://activitystrea.ms/schema/1.0/post</activity:verb> <activity:verb>http://activitystrea.ms/schema/1.0/post</activity:verb>
<id>#{note_activity.data["id"]}</id> <id>#{note_activity.data["object"]["id"]}</id>
<title>New note by #{user.nickname}</title> <title>New note by #{user.nickname}</title>
<content type="html">#{note_activity.data["object"]["content"]}</content> <content type="html">#{note_activity.data["object"]["content"]}</content>
<published>#{inserted_at}</published> <published>#{inserted_at}</published>