commit: b7584edcea024739fcef1ce6608058766d9fd73f
parent: 4d55d7c95e8409f5018f3321d7e653b6349b9ba6
Author: lambda <pleromagit@rogerbraun.net>
Date: Sun, 29 Apr 2018 09:26:47 +0000
Merge branch 'patch-bio' into 'develop'
replace newlines in profiles with <br>
See merge request pleroma/pleroma!136
Diffstat:
2 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/lib/pleroma/web/twitter_api/twitter_api_controller.ex b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
@@ -347,7 +347,8 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
def update_profile(%{assigns: %{user: user}} = conn, params) do
params =
if bio = params["description"] do
- Map.put(params, "bio", bio)
+ bio_brs = Regex.replace(~r/\r?\n/,bio,"<br>")
+ Map.put(params, "bio", bio_brs)
else
params
end
diff --git a/test/web/twitter_api/twitter_api_controller_test.exs b/test/web/twitter_api/twitter_api_controller_test.exs
@@ -784,4 +784,20 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
assert status["id"] == activity.id
end
end
+
+ test "Convert newlines to <br> in bio", %{conn: conn} do
+ user = insert(:user)
+
+ conn =
+ conn
+ |> assign(:user, user)
+ |> post("/api/account/update_profile.json", %{
+ "description" => "Hello,\r\nWorld! I\n am a test."
+ })
+
+ user = Repo.get!(User, user.id)
+ assert user.bio == "Hello,<br>World! I<br> am a test."
+ end
+
+
end