diff options
| author | lambda <pleromagit@rogerbraun.net> | 2017-12-05 11:27:11 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2017-12-05 11:27:11 +0000 |
| commit | 08e7e249b1e656bce79fec7df4ce8bf9b158855f (patch) | |
| tree | 6ffaad6b46925bd1bf5f5aff53437df7ed0528b1 /lib/pleroma/web/twitter_api/twitter_api_controller.ex | |
| parent | 7f336cb8b102c4dd5045aceebedafa1ca363bd91 (diff) | |
| parent | e7c2472abd470b3b0ba8e9321a378e5a77412e26 (diff) | |
| download | pleroma-08e7e249b1e656bce79fec7df4ce8bf9b158855f.tar.gz | |
Merge branch 'feature/chat' into 'develop'
Feature/chat
See merge request pleroma/pleroma!36
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 |