aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorraeno <just.raeno@gmail.com>2018-12-17 16:02:26 +0100
committerraeno <just.raeno@gmail.com>2018-12-17 16:02:26 +0100
commitcc878804880137740afc37a0c5d3f7e4d64d014a (patch)
tree7ebd57a38791a31117d7ab180509f919b8a8fa1c
parent567359790ea623949585629c41580961c59a01ff (diff)
downloadpleroma-cc878804880137740afc37a0c5d3f7e4d64d014a.tar.gz
Support both OAuth token record and token string in UserView
-rw-r--r--lib/pleroma/web/twitter_api/views/user_view.ex5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/pleroma/web/twitter_api/views/user_view.ex b/lib/pleroma/web/twitter_api/views/user_view.ex
index b3459af9a..8a88d72b1 100644
--- a/lib/pleroma/web/twitter_api/views/user_view.ex
+++ b/lib/pleroma/web/twitter_api/views/user_view.ex
@@ -86,7 +86,7 @@ defmodule Pleroma.Web.TwitterAPI.UserView do
}
if assigns[:token] do
- Map.put(data, "token", assigns[:token])
+ Map.put(data, "token", token_string(assigns[:token]))
else
data
end
@@ -111,4 +111,7 @@ defmodule Pleroma.Web.TwitterAPI.UserView do
defp image_url(%{"url" => [%{"href" => href} | _]}), do: href
defp image_url(_), do: nil
+
+ defp token_string(%Pleroma.Web.OAuth.Token{token: token_str}), do: token_str
+ defp token_string(token), do: token
end