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

MastoAPI: Make attachment ids strings.

Browse Source
This commit is contained in:
Roger Braun 2017-11-15 18:58:13 +01:00
parent 1cca544e20
commit ced0d64d75
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/pleroma/web/mastodon_api/views/status_view.ex
View File

@ -120,7 +120,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
<< hash_id::signed-32, _rest::binary >> = :crypto.hash(:md5, href) << hash_id::signed-32, _rest::binary >> = :crypto.hash(:md5, href)
%{ %{
id: attachment["id"] || hash_id, id: to_string(attachment["id"] || hash_id),
url: href, url: href,
remote_url: href, remote_url: href,
preview_url: href, preview_url: href,

4
test/web/mastodon_api/status_view_test.exs
View File

@ -78,7 +78,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
} }
expected = %{ expected = %{
id: 1638338801, id: "1638338801",
type: "image", type: "image",
url: "someurl", url: "someurl",
remote_url: "someurl", remote_url: "someurl",
@ -90,7 +90,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
# If theres a "id", use that instead of the generated one # If theres a "id", use that instead of the generated one
object = Map.put(object, "id", 2) object = Map.put(object, "id", 2)
assert %{id: 2} = StatusView.render("attachment.json", %{attachment: object}) assert %{id: "2"} = StatusView.render("attachment.json", %{attachment: object})
end end
test "a reblog" do test "a reblog" do