aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Braun <roger@rogerbraun.net>2017-04-26 10:08:13 +0200
committerRoger Braun <roger@rogerbraun.net>2017-04-26 10:08:13 +0200
commitd9ebd785ab7d9b371ba5accdc6ca5d72af7b509d (patch)
tree9fb7ac0d430eeb16327ce6d2e17a825441959033
parente8882ab3daa754aea8b2b1a96b7532c14530bbdc (diff)
downloadpleroma-d9ebd785ab7d9b371ba5accdc6ca5d72af7b509d.tar.gz
Ostatus doesn't distinguish between activities / objects on create.
-rw-r--r--lib/pleroma/web/ostatus/activity_representer.ex2
-rw-r--r--test/web/ostatus/activity_representer_test.exs2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/web/ostatus/activity_representer.ex b/lib/pleroma/web/ostatus/activity_representer.ex
index 367212fe1..30e695bcc 100644
--- a/lib/pleroma/web/ostatus/activity_representer.ex
+++ b/lib/pleroma/web/ostatus/activity_representer.ex
@@ -15,7 +15,7 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenter do
[
{:"activity:object-type", ['http://activitystrea.ms/schema/1.0/note']},
{:"activity:verb", ['http://activitystrea.ms/schema/1.0/post']},
- {:id, h.(activity.data["object"]["id"])},
+ {:id, h.(activity.data["id"])},
{:title, ['New note by #{user.nickname}']},
{:content, [type: 'html'], h.(activity.data["object"]["content"])},
{:published, h.(inserted_at)},
diff --git a/test/web/ostatus/activity_representer_test.exs b/test/web/ostatus/activity_representer_test.exs
index 10f9a9d0b..6cea9cff0 100644
--- a/test/web/ostatus/activity_representer_test.exs
+++ b/test/web/ostatus/activity_representer_test.exs
@@ -18,7 +18,7 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do
expected = """
<activity:object-type>http://activitystrea.ms/schema/1.0/note</activity:object-type>
<activity:verb>http://activitystrea.ms/schema/1.0/post</activity:verb>
- <id>#{note_activity.data["object"]["id"]}</id>
+ <id>#{note_activity.data["id"]}</id>
<title>New note by #{user.nickname}</title>
<content type="html">#{note_activity.data["object"]["content"]}</content>
<published>#{inserted_at}</published>