Merge branch 'bugfix/account_view_source.note' into 'develop'

MastoAPI AccountView: fill source.note with plaintext version of note

Closes #926

See merge request pleroma/pleroma!1189
This commit is contained in:
rinpatch 2019-05-22 05:39:01 +00:00
commit cdac5efd10
2 changed files with 4 additions and 4 deletions

View file

@ -112,7 +112,7 @@ defp do_render("account.json", %{user: user} = opts) do
fields: fields,
bot: bot,
source: %{
note: "",
note: HTML.strip_tags((user.bio || "") |> String.replace("<br>", "\n")),
sensitive: false,
pleroma: %{}
},

View file

@ -55,7 +55,7 @@ test "Represent a user account" do
fields: [],
bot: false,
source: %{
note: "",
note: "valid html",
sensitive: false,
pleroma: %{}
},
@ -120,7 +120,7 @@ test "Represent a Service(bot) account" do
fields: [],
bot: true,
source: %{
note: "",
note: user.bio,
sensitive: false,
pleroma: %{}
},
@ -209,7 +209,7 @@ test "represent an embedded relationship" do
fields: [],
bot: true,
source: %{
note: "",
note: user.bio,
sensitive: false,
pleroma: %{}
},