Merge remote-tracking branch 'origin' into follower-hiding

lib/pleroma/web/twitter_api/twitter_api.ex

@@ -132,7 +132,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
     params = %{
       nickname: params["nickname"],
       name: params["fullname"],
-      bio: params["bio"],
+      bio: User.parse_bio(params["bio"]),
       email: params["email"],
       password: params["password"],
       password_confirmation: params["confirm"]

lib/pleroma/web/twitter_api/twitter_api_controller.ex

@@ -462,27 +462,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),