diff options
author | Maxim Filippov <colixer@gmail.com> | 2018-12-02 22:03:53 +0300 |
---|---|---|
committer | Maxim Filippov <colixer@gmail.com> | 2018-12-02 22:03:53 +0300 |
commit | ce98d5eb9b4d9c5a09b91a9d4d13bb48ba2b8453 (patch) | |
tree | 248211f13a9dd265a04998ceb1a2fb920f80d54e /lib/pleroma/web/twitter_api/twitter_api_controller.ex | |
parent | 371d96b1da85960dafea9665b8bc32ba553b1555 (diff) | |
download | pleroma-ce98d5eb9b4d9c5a09b91a9d4d13bb48ba2b8453.tar.gz |
Parse user's bio on register
Diffstat (limited to 'lib/pleroma/web/twitter_api/twitter_api_controller.ex')
-rw-r--r-- | lib/pleroma/web/twitter_api/twitter_api_controller.ex | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/lib/pleroma/web/twitter_api/twitter_api_controller.ex b/lib/pleroma/web/twitter_api/twitter_api_controller.ex index ff644dd79..961250d92 100644 --- a/lib/pleroma/web/twitter_api/twitter_api_controller.ex +++ b/lib/pleroma/web/twitter_api/twitter_api_controller.ex @@ -448,27 +448,16 @@ defmodule Pleroma.Web.TwitterAPI.Controller do User.Info.profile_update(user.info, info_params) end - defp add_profile_emoji(user, params) do + defp parse_profile_bio(user, params) do if bio = params["description"] do - mentions = Formatter.parse_mentions(bio) - tags = Formatter.parse_tags(bio) - - emoji = - (user.info.source_data["tag"] || []) - |> Enum.filter(fn %{"type" => t} -> t == "Emoji" end) - |> Enum.map(fn %{"icon" => %{"url" => url}, "name" => name} -> - {String.trim(name, ":"), url} - end) - - bio_html = CommonUtils.format_input(bio, mentions, tags, "text/plain") - Map.put(params, "bio", bio_html |> Formatter.emojify(emoji)) + Map.put(params, "bio", User.parse_bio(bio, user)) else params end end def update_profile(%{assigns: %{user: user}} = conn, params) do - params = add_profile_emoji(user, params) + params = parse_profile_bio(user, params) info_cng = build_info_cng(user, params) with changeset <- User.update_changeset(user, params), |