diff options
| author | Roger Braun <roger@rogerbraun.net> | 2017-10-31 14:40:12 +0100 |
|---|---|---|
| committer | Roger Braun <roger@rogerbraun.net> | 2017-10-31 14:40:12 +0100 |
| commit | ce7f9f527c55b282a56c86a68c358a6272d01aee (patch) | |
| tree | 68bdfa11cdf80219c6c56d78ad92c418a904bcec | |
| parent | f23edd2d6b67ee30ccd16b7a27d9e07a9f928574 (diff) | |
| download | pleroma-ce7f9f527c55b282a56c86a68c358a6272d01aee.tar.gz pleroma-ce7f9f527c55b282a56c86a68c358a6272d01aee.zip | |
MastoAPI: Always return an url for statuses.
External url if available, id if not.
| -rw-r--r-- | lib/pleroma/web/mastodon_api/views/status_view.ex | 2 | ||||
| -rw-r--r-- | test/web/mastodon_api/status_view_test.exs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/web/mastodon_api/views/status_view.ex b/lib/pleroma/web/mastodon_api/views/status_view.ex index 272f83b2a..b3bb50880 100644 --- a/lib/pleroma/web/mastodon_api/views/status_view.ex +++ b/lib/pleroma/web/mastodon_api/views/status_view.ex @@ -80,7 +80,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do %{ id: activity.id, uri: object["id"], - url: object["external_url"], + url: object["external_url"] || object["id"], account: AccountView.render("account.json", %{user: user}), in_reply_to_id: reply_to && reply_to.id, in_reply_to_account_id: reply_to_user && reply_to_user.id, diff --git a/test/web/mastodon_api/status_view_test.exs b/test/web/mastodon_api/status_view_test.exs index dc5cdfe9a..caa2c9d83 100644 --- a/test/web/mastodon_api/status_view_test.exs +++ b/test/web/mastodon_api/status_view_test.exs @@ -19,7 +19,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do expected = %{ id: note.id, uri: note.data["object"]["id"], - url: note.data["object"]["external_id"], + url: note.data["object"]["id"], account: AccountView.render("account.json", %{user: user}), in_reply_to_id: nil, in_reply_to_account_id: nil, |