summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authoreugenijm <eugenijm@protonmail.com>2019-09-19 08:27:55 +0300
committereugenijm <eugenijm@protonmail.com>2019-09-19 08:59:25 +0300
commitfe5e0b784604b1352e98e7915c3c67d59ac4f709 (patch)
tree9aea1a07b72ba723eb15d177eae8e4e657322b68 /lib
parentf95a2b2cda236f7c0e5ced2a4698e2b10d99fa53 (diff)
downloadpleroma-fe5e0b784604b1352e98e7915c3c67d59ac4f709.tar.gz
pleroma-fe5e0b784604b1352e98e7915c3c67d59ac4f709.zip
Mastodon API: Return `pleroma.direct_conversation_id` when creating direct messages (`POST /api/v1/statuses`)
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex7
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