diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2019-09-23 21:32:50 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2019-09-23 21:32:50 +0300 |
| commit | 38245f13367cdc2df29ff2a499418e526b654fb5 (patch) | |
| tree | 514724023f061f56e42fcaa7ae79f07d3d055c58 /lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex | |
| parent | d4ed3a35b8aa34cd968113970bbab445eb251703 (diff) | |
| parent | fd48bd80eb7eab563c25586b1deba2ed42c02c5a (diff) | |
| download | pleroma-38245f13367cdc2df29ff2a499418e526b654fb5.tar.gz | |
Merge branch 'develop' into test/activity_pub/transmogrifier.ex
Diffstat (limited to 'lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex')
| -rw-r--r-- | lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex index 37eeb2ac3..6704ee7e8 100644 --- a/lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex +++ b/lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex @@ -611,7 +611,12 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do {:ok, activity} -> conn |> put_view(StatusView) - |> try_render("status.json", %{activity: activity, for: user, as: :activity}) + |> try_render("status.json", %{ + activity: activity, + for: user, + as: :activity, + with_direct_conversation_id: true + }) end end end |