commit: 2e89d505d357c17962fdcf48b7ab48ae69ec519e
parent: 6aa1523bb3d8dfe12ce5143d27023fd833b0c1aa
Author: Roger Braun <roger@rogerbraun.net>
Date: Thu, 30 Mar 2017 18:07:38 +0200
Connect attachments with objects, not activities.
Diffstat:
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/lib/pleroma/web/twitter_api/representers/activity_representer.ex b/lib/pleroma/web/twitter_api/representers/activity_representer.ex
@@ -17,7 +17,7 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter do
"created_at" => published,
"in_reply_to_status_id" => activity.data["object"]["inReplyToStatusId"],
"statusnet_conversation_id" => activity.data["object"]["statusnetConversationId"],
- "attachments" => (activity.data["attachment"] || []) |> ObjectRepresenter.enum_to_list(opts)
+ "attachments" => (activity.data["object"]["attachment"] || []) |> ObjectRepresenter.enum_to_list(opts)
}
end
end
diff --git a/lib/pleroma/web/twitter_api/twitter_api.ex b/lib/pleroma/web/twitter_api/twitter_api.ex
@@ -24,11 +24,11 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
"type" => "Note",
"content" => data["status"],
"published" => date,
- "context" => context
+ "context" => context,
+ "attachment" => attachments
},
"published" => date,
- "context" => context,
- "attachment" => attachments
+ "context" => context
}
# Wire up reply info.
diff --git a/test/web/twitter_api/representers/activity_representer_test.exs b/test/web/twitter_api/representers/activity_representer_test.exs
@@ -33,16 +33,16 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenterTest do
User.ap_followers(user),
"https://www.w3.org/ns/activitystreams#Public"
],
- "attachment" => [
- object
- ],
"actor" => User.ap_id(user),
"object" => %{
"published" => date,
"type" => "Note",
"content" => content,
"inReplyToStatusId" => 213123,
- "statusnetConversationId" => 4711
+ "statusnetConversationId" => 4711,
+ "attachment" => [
+ object
+ ]
},
"published" => date
}
diff --git a/test/web/twitter_api/twitter_api_test.exs b/test/web/twitter_api/twitter_api_test.exs
@@ -40,7 +40,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
assert get_in(activity.data, ["object", "statusnetConversationId"]) == activity.id
assert get_in(activity.data, ["statusnetConversationId"]) == activity.id
- assert is_list(activity.data["attachment"])
+ assert is_list(activity.data["object"]["attachment"])
end
test "create a status that is a reply" do