diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2019-10-21 14:19:15 +0700 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2019-10-21 14:19:15 +0700 |
| commit | 4ea1a61b008c932bc83fcd6cd07bb7f4c251204a (patch) | |
| tree | c763bd3a2a21ee3e40384ee323076bbb577b7ccb /lib/pleroma/web/mastodon_api/controllers | |
| parent | 8ad015ef64e0d2a4cd9f2979ff08d28be3a635e5 (diff) | |
| parent | 62e3d76a450c1b34ba8d0c88a184ec861ed90f29 (diff) | |
| download | pleroma-4ea1a61b008c932bc83fcd6cd07bb7f4c251204a.tar.gz | |
Merge branch 'develop' into refactor/following-relationships
Diffstat (limited to 'lib/pleroma/web/mastodon_api/controllers')
| -rw-r--r-- | lib/pleroma/web/mastodon_api/controllers/status_controller.ex | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/pleroma/web/mastodon_api/controllers/status_controller.ex b/lib/pleroma/web/mastodon_api/controllers/status_controller.ex index 0c16e9b0f..e5d016f63 100644 --- a/lib/pleroma/web/mastodon_api/controllers/status_controller.ex +++ b/lib/pleroma/web/mastodon_api/controllers/status_controller.ex @@ -167,7 +167,11 @@ defmodule Pleroma.Web.MastodonAPI.StatusController do def show(%{assigns: %{user: user}} = conn, %{"id" => id}) do with %Activity{} = activity <- Activity.get_by_id_with_object(id), true <- Visibility.visible_for_user?(activity, user) do - try_render(conn, "show.json", activity: activity, for: user) + try_render(conn, "show.json", + activity: activity, + for: user, + with_direct_conversation_id: true + ) end end |