moon
/
honkoma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feature/twitterapi-object-description' into 'develop' 

twitter api: provide object descriptions as attachment description field

See merge request pleroma/pleroma!293
This commit is contained in:
kaniini 2018-08-25 00:20:25 +00:00
parent 66bc37925e aab2bdddf4
commit ffa552f1a4
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,7 +9,8 @@ def to_map(%Object{data: %{"url" => [url | _]}} = object, _opts) do
url: url["href"] |> Pleroma.Web.MediaProxy.url(), url: url["href"] |> Pleroma.Web.MediaProxy.url(),
mimetype: url["mediaType"] || url["mimeType"], mimetype: url["mediaType"] || url["mimeType"],
id: data["uuid"], id: data["uuid"],
oembed: false oembed: false,
description: data["name"]
} }
end end
@ -18,7 +19,8 @@ def to_map(%Object{data: %{"url" => url} = data}, _opts) when is_binary(url) do
url: url |> Pleroma.Web.MediaProxy.url(), url: url |> Pleroma.Web.MediaProxy.url(),
mimetype: data["mediaType"] || url["mimeType"], mimetype: data["mediaType"] || url["mimeType"],
id: data["uuid"], id: data["uuid"],
oembed: false oembed: false,
description: data["name"]
} }
end end

6
test/web/twitter_api/representers/object_representer_test.exs
View File

@ -23,7 +23,8 @@ test "represent an image attachment" do
id: 6, id: 6,
url: "someurl", url: "someurl",
mimetype: "sometype", mimetype: "sometype",
oembed: false oembed: false,
description: nil
} }
assert expected_object == ObjectRepresenter.to_map(object) assert expected_object == ObjectRepresenter.to_map(object)
@ -46,7 +47,8 @@ test "represents mastodon-style attachments" do
"http://mastodon.example.org/system/media_attachments/files/000/000/001/original/8619f31c6edec470.png", "http://mastodon.example.org/system/media_attachments/files/000/000/001/original/8619f31c6edec470.png",
mimetype: "image/png", mimetype: "image/png",
oembed: false, oembed: false,
id: nil id: nil,
description: "blabla"
} }
assert expected_object == ObjectRepresenter.to_map(object) assert expected_object == ObjectRepresenter.to_map(object)