Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop

[akkoma] / lib / pleroma / web / twitter_api / twitter_api_controller.ex

diff --git a/lib/pleroma/web/twitter_api/twitter_api_controller.ex b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
index 0ee90496f7259b66a3a6a92f882c567060948fc6..960925f4266c28a0e525c2fadf8b2d4a7856678a 100644 (file)
--- a/lib/pleroma/web/twitter_api/twitter_api_controller.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
@@ -347,7 +347,7 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
   def update_profile(%{assigns: %{user: user}} = conn, params) do
     params =
       if bio = params["description"] do
-        bio_brs = Regex.replace(~r/\r\n/,bio,"<br>")
+        bio_brs = Regex.replace(~r/\r?\n/, bio, "<br>")
         Map.put(params, "bio", bio_brs)
       else
         params