aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorlambda <pleromagit@rogerbraun.net>2018-07-12 05:55:20 +0000
committerlambda <pleromagit@rogerbraun.net>2018-07-12 05:55:20 +0000
commit33b033421649f6a7354616ff3458b856ca89637c (patch)
tree058c8902d70bf97e2dd11c5f9be1c3d657d4a647 /lib
parentb06e61bc4ea0a0b4c8e8ff9e4469b6def7e13932 (diff)
parent7a351cb36f64ae98fa3d28d5133fa0a49d376659 (diff)
downloadpleroma-33b033421649f6a7354616ff3458b856ca89637c.tar.gz
Merge branch 'bugfix/status-url-field' into 'develop'
[Pleroma.Web.MastodonAPI.StatusView]: Fill the url field for statuses Closes #231 See merge request pleroma/pleroma!246
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/mastodon_api/views/status_view.ex3
1 files changed, 1 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 59898457b..39abb4c6b 100644
--- a/lib/pleroma/web/mastodon_api/views/status_view.ex
+++ b/lib/pleroma/web/mastodon_api/views/status_view.ex
@@ -54,8 +54,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
%{
id: to_string(activity.id),
uri: object,
- # TODO: This might be wrong, check with mastodon.
- url: nil,
+ url: object,
account: AccountView.render("account.json", %{user: user}),
in_reply_to_id: nil,
in_reply_to_account_id: nil,