projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'admin-api-change-password' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
mastodon_api
/
views
/
account_view.ex
diff --git
a/lib/pleroma/web/mastodon_api/views/account_view.ex
b/lib/pleroma/web/mastodon_api/views/account_view.ex
index 4ebce73b45ee21047f3822e4bdea6b0cc8b1eac7..2bf711386e3ec8e2b2f7ccb98be54cbc11d227eb 100644
(file)
--- a/
lib/pleroma/web/mastodon_api/views/account_view.ex
+++ b/
lib/pleroma/web/mastodon_api/views/account_view.ex
@@
-115,7
+115,7
@@
defmodule Pleroma.Web.MastodonAPI.AccountView do
fields: user.fields,
bot: bot,
source: %{
fields: user.fields,
bot: bot,
source: %{
- note:
Pleroma.HTML.strip_tags((user.bio || "") |> String.replace("<br>", "\n")
),
+ note:
(user.bio || "") |> String.replace(~r(<br */?>), "\n") |> Pleroma.HTML.strip_tags(
),
sensitive: false,
fields: user.raw_fields,
pleroma: %{
sensitive: false,
fields: user.raw_fields,
pleroma: %{