mirrors/akkoma
1
0
Fork 1
mirror of https://akkoma.dev/AkkomaGang/akkoma.git synced 2024-11-18 10:59:17 +00:00
Code Issues Wiki Activity

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

Browse source 
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
parent 79c2cef2fb 0e2c215a00
commit cdac5efd10
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/pleroma/web/mastodon_api/views/account_view.ex
View file

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

6
test/web/mastodon_api/account_view_test.exs
View file

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