diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-05-22 05:39:01 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-05-22 05:39:01 +0000 |
| commit | cdac5efd10bba6e767c59f17e71f2eb8f3f2d601 (patch) | |
| tree | 7a8e7f453046cfe2d98e7cfdbe7a352b6d5559fe | |
| parent | 79c2cef2fbcbac99cce001376b8231e0e0a9adf4 (diff) | |
| parent | 0e2c215a006c7ca5756e80a357ff6395a4325946 (diff) | |
| download | pleroma-cdac5efd10bba6e767c59f17e71f2eb8f3f2d601.tar.gz pleroma-cdac5efd10bba6e767c59f17e71f2eb8f3f2d601.zip | |
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
| -rw-r--r-- | lib/pleroma/web/mastodon_api/views/account_view.ex | 2 | ||||
| -rw-r--r-- | test/web/mastodon_api/account_view_test.exs | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/pleroma/web/mastodon_api/views/account_view.ex b/lib/pleroma/web/mastodon_api/views/account_view.ex index 134c07b7e..b82d3319b 100644 --- a/lib/pleroma/web/mastodon_api/views/account_view.ex +++ b/lib/pleroma/web/mastodon_api/views/account_view.ex @@ -112,7 +112,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountView do fields: fields, bot: bot, source: %{ - note: "", + note: HTML.strip_tags((user.bio || "") |> String.replace("<br>", "\n")), sensitive: false, pleroma: %{} }, diff --git a/test/web/mastodon_api/account_view_test.exs b/test/web/mastodon_api/account_view_test.exs index a24f2a050..aaf2261bb 100644 --- a/test/web/mastodon_api/account_view_test.exs +++ b/test/web/mastodon_api/account_view_test.exs @@ -55,7 +55,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do fields: [], bot: false, source: %{ - note: "", + note: "valid html", sensitive: false, pleroma: %{} }, @@ -120,7 +120,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do fields: [], bot: true, source: %{ - note: "", + note: user.bio, sensitive: false, pleroma: %{} }, @@ -209,7 +209,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do fields: [], bot: true, source: %{ - note: "", + note: user.bio, sensitive: false, pleroma: %{} }, |