diff options
| author | Roger Braun <roger@rogerbraun.net> | 2017-10-31 14:51:41 +0100 |
|---|---|---|
| committer | Roger Braun <roger@rogerbraun.net> | 2017-10-31 14:51:41 +0100 |
| commit | 968a546d4ac7d6b50af84aea71b3b37af8f2f669 (patch) | |
| tree | 8ef4424283031bfb6184926eb2b89acc7cc3d706 | |
| parent | f6372b245a2d65cf1c225adfe7bf822094cb4e1e (diff) | |
| download | pleroma-968a546d4ac7d6b50af84aea71b3b37af8f2f669.tar.gz | |
MastoAPI: Return id as string instead of integer.
| -rw-r--r-- | lib/pleroma/web/mastodon_api/views/status_view.ex | 6 | ||||
| -rw-r--r-- | test/web/mastodon_api/status_view_test.exs | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/lib/pleroma/web/mastodon_api/views/status_view.ex b/lib/pleroma/web/mastodon_api/views/status_view.ex index b3bb50880..48703e657 100644 --- a/lib/pleroma/web/mastodon_api/views/status_view.ex +++ b/lib/pleroma/web/mastodon_api/views/status_view.ex @@ -21,9 +21,9 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do |> Enum.map(fn (user) -> AccountView.render("mention.json", %{user: user}) end) %{ - id: activity.id, + id: to_string(activity.id), uri: object, - url: nil, + url: nil, # TODO: This might be wrong, check with mastodon. account: AccountView.render("account.json", %{user: user}), in_reply_to_id: nil, in_reply_to_account_id: nil, @@ -78,7 +78,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do |> Enum.map(fn {name, url} -> %{ shortcode: name, url: url, static_url: url } end) %{ - id: activity.id, + id: to_string(activity.id), uri: object["id"], url: object["external_url"] || object["id"], account: AccountView.render("account.json", %{user: user}), diff --git a/test/web/mastodon_api/status_view_test.exs b/test/web/mastodon_api/status_view_test.exs index caa2c9d83..5aeee98c4 100644 --- a/test/web/mastodon_api/status_view_test.exs +++ b/test/web/mastodon_api/status_view_test.exs @@ -17,7 +17,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do |> String.replace(~r/\.\d+Z/, ".000Z") expected = %{ - id: note.id, + id: to_string(note.id), uri: note.data["object"]["id"], url: note.data["object"]["id"], account: AccountView.render("account.json", %{user: user}), @@ -101,7 +101,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do represented = StatusView.render("status.json", %{for: user, activity: reblog}) - assert represented[:id] == reblog.id - assert represented[:reblog][:id] == activity.id + assert represented[:id] == to_string(reblog.id) + assert represented[:reblog][:id] == to_string(activity.id) end end |