Revert "Merge branch 'revert-a26d5e6b' into 'develop'"

This reverts commit d31bbb1cfe, reversing changes made to 340ab3cb90.
2018-09-02 00:14:25 +00:00 · 2018-09-02 00:14:25 +00:00 · b1be9415ef
commit b1be9415ef
parent f7ba393bb9
7 changed files with 78 additions and 7 deletions
--- a/lib/pleroma/web/twitter_api/twitter_api_controller.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
@ -423,7 +423,7 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
            {String.trim(name, ":"), url}
          end)

-        bio_html = CommonUtils.format_input(bio, mentions, tags)
+        bio_html = CommonUtils.format_input(bio, mentions, tags, "text/plain")
        Map.put(params, "bio", bio_html |> Formatter.emojify(emoji))
      else
        params