moon
/
honkoma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
lambda 2018-12-17 20:16:15 +00:00
parent ebbe11f33b cc87880488
commit 3d980daa49
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/pleroma/web/twitter_api/views/user_view.ex
View File

@ -86,7 +86,7 @@ def render("user.json", %{user: user = %User{}} = assigns) do
} }
if assigns[:token] do if assigns[:token] do
Map.put(data, "token", assigns[:token]) Map.put(data, "token", token_string(assigns[:token]))
else else
data data
end end
@ -111,4 +111,7 @@ def render("short.json", %{
defp image_url(%{"url" => [%{"href" => href} | _]}), do: href defp image_url(%{"url" => [%{"href" => href} | _]}), do: href
defp image_url(_), do: nil 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 end