diff options
author | William Pitcock <nenolod@dereferenced.org> | 2019-01-27 12:39:20 +0000 |
---|---|---|
committer | William Pitcock <nenolod@dereferenced.org> | 2019-01-28 05:53:17 +0000 |
commit | 24a103a1fe199a559a22ddb55c747a89f5576e55 (patch) | |
tree | 6ffa17844be9088da9253beafa533d5b4a269db3 | |
parent | 6096846f5f33e1e81ef72c0f97b30c2745426c5d (diff) | |
download | pleroma-24a103a1fe199a559a22ddb55c747a89f5576e55.tar.gz |
mastodon api: formatting
-rw-r--r-- | lib/pleroma/web/mastodon_api/mastodon_api_controller.ex | 8 |
1 files changed, 6 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 index 1cdb96989..b5231a326 100644 --- a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex +++ b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex @@ -8,6 +8,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do alias Pleroma.Web alias Pleroma.Web.MastodonAPI + alias Pleroma.Web.MastodonAPI.{ StatusView, AccountView, @@ -500,7 +501,8 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do def upload(%{assigns: %{user: user}} = conn, %{"file" => file} = data) do with {:ok, object} <- - ActivityPub.upload(file, + ActivityPub.upload( + file, actor: User.ap_id(user), description: Map.get(data, "description") ) do @@ -1101,7 +1103,9 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do def login(conn, _) do with {:ok, app} <- get_or_make_app() do path = - o_auth_path(conn, :authorize, + o_auth_path( + conn, + :authorize, response_type: "code", client_id: app.client_id, redirect_uri: ".", |