logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
commit: ced0d64d75831c68851d4deef9875343d9114eaa
parent: 1cca544e206e8e7f38077fba6392c252803c13ec
Author: Roger Braun <roger@rogerbraun.net>
Date:   Wed, 15 Nov 2017 18:58:13 +0100

MastoAPI: Make attachment ids strings.

Diffstat:

Mlib/pleroma/web/mastodon_api/views/status_view.ex2+-
Mtest/web/mastodon_api/status_view_test.exs4++--
2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/pleroma/web/mastodon_api/views/status_view.ex b/lib/pleroma/web/mastodon_api/views/status_view.ex @@ -120,7 +120,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do << hash_id::signed-32, _rest::binary >> = :crypto.hash(:md5, href) %{ - id: attachment["id"] || hash_id, + id: to_string(attachment["id"] || hash_id), url: href, remote_url: href, preview_url: href, diff --git a/test/web/mastodon_api/status_view_test.exs b/test/web/mastodon_api/status_view_test.exs @@ -78,7 +78,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do } expected = %{ - id: 1638338801, + id: "1638338801", type: "image", 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 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 test "a reblog" do