a1batross
/
pleroma
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Connect attachments with objects, not activities.

This commit is contained in:
Roger Braun 2017-03-30 18:07:38 +02:00
parent 6aa1523bb3
commit 2e89d505d3
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/pleroma/web/twitter_api/representers/activity_representer.ex
View File

@ -17,7 +17,7 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter do
"created_at" => published, "created_at" => published,
"in_reply_to_status_id" => activity.data["object"]["inReplyToStatusId"], "in_reply_to_status_id" => activity.data["object"]["inReplyToStatusId"],
"statusnet_conversation_id" => activity.data["object"]["statusnetConversationId"], "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
end end

6
lib/pleroma/web/twitter_api/twitter_api.ex
View File

@ -24,11 +24,11 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
"type" => "Note", "type" => "Note",
"content" => data["status"], "content" => data["status"],
"published" => date, "published" => date,
"context" => context "context" => context,
"attachment" => attachments
}, },
"published" => date, "published" => date,
"context" => context, "context" => context
"attachment" => attachments
} }
# Wire up reply info. # Wire up reply info.

8
test/web/twitter_api/representers/activity_representer_test.exs
View File

@ -33,16 +33,16 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenterTest do
User.ap_followers(user), User.ap_followers(user),
"https://www.w3.org/ns/activitystreams#Public" "https://www.w3.org/ns/activitystreams#Public"
], ],
"attachment" => [
object
],
"actor" => User.ap_id(user), "actor" => User.ap_id(user),
"object" => %{ "object" => %{
"published" => date, "published" => date,
"type" => "Note", "type" => "Note",
"content" => content, "content" => content,
"inReplyToStatusId" => 213123, "inReplyToStatusId" => 213123,
"statusnetConversationId" => 4711 "statusnetConversationId" => 4711,
"attachment" => [
object
]
}, },
"published" => date "published" => date
} }

2
test/web/twitter_api/twitter_api_test.exs
View File

@ -40,7 +40,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
assert get_in(activity.data, ["object", "statusnetConversationId"]) == activity.id assert get_in(activity.data, ["object", "statusnetConversationId"]) == activity.id
assert get_in(activity.data, ["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 end
test "create a status that is a reply" do test "create a status that is a reply" do