projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'bugfix/undocumented-mastodon-app-api' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
mastodon_api
/
mastodon_api_controller.ex
diff --git
a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
index d3b95e793e660df9fd8a71930cf244ec2aba8f7a..f17e2eda2780107ce44aac9a4470fb877fd2c5e9 100644
(file)
--- a/
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
+++ b/
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
@@
-20,7
+20,7
@@
defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
{:ok, app} <- Repo.insert(cs) |> IO.inspect() do
res = %{
id: app.id |> to_string,
- name: app.name,
+ name: app.
client_
name,
client_id: app.client_id,
client_secret: app.client_secret,
redirect_uris: app.redirect_uris,