logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
commit: bc215f568473bb3801b6eff238fee48f5de2bab8
parent: b7584edcea024739fcef1ce6608058766d9fd73f
Author: lain <lain@soykaf.club>
Date:   Sun, 29 Apr 2018 11:28:26 +0200

Fix format.

Diffstat:

Mlib/pleroma/web/twitter_api/twitter_api_controller.ex2+-
Mtest/web/twitter_api/twitter_api_controller_test.exs20+++++++++-----------
2 files changed, 10 insertions(+), 12 deletions(-)

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,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 diff --git a/test/web/twitter_api/twitter_api_controller_test.exs b/test/web/twitter_api/twitter_api_controller_test.exs @@ -786,18 +786,16 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do end test "Convert newlines to <br> in bio", %{conn: conn} do - user = insert(:user) + user = insert(:user) - conn = - conn - |> assign(:user, user) - |> post("/api/account/update_profile.json", %{ - "description" => "Hello,\r\nWorld! I\n am a test." - }) + 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." + user = Repo.get!(User, user.id) + assert user.bio == "Hello,<br>World! I<br> am a test." end - - end