sjw/pleroma
1
0
Fork 0
mirror of https://git.pleroma.social/sjw/pleroma.git synced 2024-12-27 22:05:35 +01:00
Code Issues Releases Wiki Activity

Merge branch 'patch-bio' into 'develop'

Browse Source 
replace newlines in profiles with <br>

See merge request pleroma/pleroma!136
This commit is contained in:
lambda 2018-04-29 09:26:47 +00:00
commit b7584edcea
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/pleroma/web/twitter_api/twitter_api_controller.ex
View File

@ -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

16
test/web/twitter_api/twitter_api_controller_test.exs
View File

@ -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