pleroma

commit: 3d980daa49e51c7e3ec1f019e2b68c8108b37c76
parent: ebbe11f33b62cb248170ba25e5c9cd2e5b339b3a
Author: lambda <pleromagit@rogerbraun.net>
Date:   Mon, 17 Dec 2018 20:16:15 +0000

Merge branch '459_fix_user_profile_crash' into 'develop'

Fix update_profile failing due to OAuth token record in assigns instead of string

Closes #459

See merge request pleroma/pleroma!561
Diffstat:
M
lib/pleroma/web/twitter_api/views/user_view.ex
5
++++-

1 file changed, 4 insertions(+), 1 deletion(-)
diff --git 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