aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
diff options
context:
space:
mode:
authorlambda <pleromagit@rogerbraun.net>2018-12-03 16:31:00 +0000
committerlambda <pleromagit@rogerbraun.net>2018-12-03 16:31:00 +0000
commit88b05aeabb23412530f6b74934bc3d2d3fe8c29f (patch)
treecc533e19e236ac317a003771d63cf707f5f974f7 /lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
parent42ef7cd227ba075fbd05e9625dc880feddee4417 (diff)
parent4b70e5eae93f34c1b98263a96d4e1380ef579ede (diff)
downloadpleroma-88b05aeabb23412530f6b74934bc3d2d3fe8c29f.tar.gz
Merge branch 'fix/parse-user-bio' into 'develop'
Parse user's bio on register See merge request pleroma/pleroma!492
Diffstat (limited to 'lib/pleroma/web/mastodon_api/mastodon_api_controller.ex')
-rw-r--r--lib/pleroma/web/mastodon_api/mastodon_api_controller.ex2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
index d19d55044..543fdf416 100644
--- a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
+++ b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
@@ -55,7 +55,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
user_params =
%{}
|> add_if_present(params, "display_name", :name)
- |> add_if_present(params, "note", :bio)
+ |> add_if_present(params, "note", :bio, fn value -> {:ok, User.parse_bio(value)} end)
|> add_if_present(params, "avatar", :avatar, fn value ->
with %Plug.Upload{} <- value,
{:ok, object} <- ActivityPub.upload(value, type: :avatar) do