diff options
| author | kaniini <ariadne@dereferenced.org> | 2019-07-24 19:28:21 +0000 |
|---|---|---|
| committer | kaniini <ariadne@dereferenced.org> | 2019-07-24 19:28:21 +0000 |
| commit | 931c4974ee4a5e5e806433ce7b367928e4210e0c (patch) | |
| tree | 453b14e77c37a00da1ed35eb6dd781cb46055d70 /lib | |
| parent | acd20914ec5a2cedfcd6a7405a22b6453d951164 (diff) | |
| parent | b20020da160404f6f668eec2a2a42aaa2b6a09b2 (diff) | |
| download | pleroma-931c4974ee4a5e5e806433ce7b367928e4210e0c.tar.gz | |
Merge branch 'fix/put-correct-activity-url' into 'develop'
Show the url advertised in the Activity in the Status JSON response
Closes #1077
See merge request pleroma/pleroma!1485
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/mastodon_api/views/status_view.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/mastodon_api/views/status_view.ex b/lib/pleroma/web/mastodon_api/views/status_view.ex index de9425959..80df9b2ac 100644 --- a/lib/pleroma/web/mastodon_api/views/status_view.ex +++ b/lib/pleroma/web/mastodon_api/views/status_view.ex @@ -222,7 +222,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do if user.local do Pleroma.Web.Router.Helpers.o_status_url(Pleroma.Web.Endpoint, :notice, activity) else - object.data["external_url"] || object.data["id"] + object.data["url"] || object.data["external_url"] || object.data["id"] end %{ |