diff options
| author | Roger Braun <roger@rogerbraun.net> | 2017-03-30 18:07:38 +0200 |
|---|---|---|
| committer | Roger Braun <roger@rogerbraun.net> | 2017-03-30 18:07:38 +0200 |
| commit | 2e89d505d357c17962fdcf48b7ab48ae69ec519e (patch) | |
| tree | 334f6b5758875a1e928211906754121a5d88d903 /lib | |
| parent | 6aa1523bb3d8dfe12ce5143d27023fd833b0c1aa (diff) | |
| download | pleroma-2e89d505d357c17962fdcf48b7ab48ae69ec519e.tar.gz | |
Connect attachments with objects, not activities.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/twitter_api/representers/activity_representer.ex | 2 | ||||
| -rw-r--r-- | lib/pleroma/web/twitter_api/twitter_api.ex | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/pleroma/web/twitter_api/representers/activity_representer.ex b/lib/pleroma/web/twitter_api/representers/activity_representer.ex index bcb819200..0cf20dc45 100644 --- 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 index ab2b1aab7..c07c7cfbf 100644 --- 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. |