commit: bdb6811f6f66a2eea1158983c86ae434f161dd7b
parent: 03966bb0f77295f9c597619ebecbc0b499b5d065
Author: kaniini <nenolod@gmail.com>
Date: Thu, 16 Aug 2018 23:59:34 +0000
Merge branch 'bugfix/undocumented-mastodon-app-api' into 'develop'
mastodon api: add undocumented fields to json response, return app id as string…
See merge request pleroma/pleroma!274
Diffstat:
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
@@ -19,9 +19,12 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
with cs <- App.register_changeset(%App{}, params) |> IO.inspect(),
{:ok, app} <- Repo.insert(cs) |> IO.inspect() do
res = %{
- id: app.id,
+ id: app.id |> to_string,
+ name: app.client_name,
client_id: app.client_id,
- client_secret: app.client_secret
+ client_secret: app.client_secret,
+ redirect_uris: app.redirect_uris,
+ website: app.website
}
json(conn, res)