diff options
| author | href <href@random.sh> | 2017-12-05 14:12:15 +0100 |
|---|---|---|
| committer | href <href@random.sh> | 2017-12-05 14:12:15 +0100 |
| commit | 72f7baa6548dbd5cc5ae4c37d9c2e53126203449 (patch) | |
| tree | a4923155f8740e8570be4400785a72d8cd6e6bbc /lib/pleroma/web/twitter_api/twitter_api_controller.ex | |
| parent | 1cb5cbdc6c1cd065e90961a9d538cb72610ae481 (diff) | |
| parent | 08e7e249b1e656bce79fec7df4ce8bf9b158855f (diff) | |
| download | pleroma-72f7baa6548dbd5cc5ae4c37d9c2e53126203449.tar.gz | |
Merge remote-tracking branch 'upstream/develop' into media-proxy
Diffstat (limited to 'lib/pleroma/web/twitter_api/twitter_api_controller.ex')
| -rw-r--r-- | lib/pleroma/web/twitter_api/twitter_api_controller.ex | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/pleroma/web/twitter_api/twitter_api_controller.ex b/lib/pleroma/web/twitter_api/twitter_api_controller.ex index 1a706029a..73d96c73d 100644 --- a/lib/pleroma/web/twitter_api/twitter_api_controller.ex +++ b/lib/pleroma/web/twitter_api/twitter_api_controller.ex @@ -10,7 +10,8 @@ defmodule Pleroma.Web.TwitterAPI.Controller do require Logger def verify_credentials(%{assigns: %{user: user}} = conn, _params) do - render(conn, UserView, "show.json", %{user: user}) + token = Phoenix.Token.sign(conn, "user socket", user.id) + render(conn, UserView, "show.json", %{user: user, token: token}) end def status_update(%{assigns: %{user: user}} = conn, %{"status" => _} = status_data) do |