aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Braun <roger@rogerbraun.net>2017-06-18 13:17:35 +0200
committerRoger Braun <roger@rogerbraun.net>2017-06-18 13:17:35 +0200
commit7b41e103e1146ed2912cd2c336079947fef71e9a (patch)
treefa8b4102a61dc2e25062b3ad6eae9d240751d2ae
parentcde5d6b71ce9280ae6e84a469e13a0eb6b561ca3 (diff)
downloadpleroma-7b41e103e1146ed2912cd2c336079947fef71e9a.tar.gz
Remove html from user bios on display.
This is mainly to fix problems of bios coming from mastodong.
-rw-r--r--lib/pleroma/web/twitter_api/representers/user_representer.ex2
-rw-r--r--test/web/twitter_api/representers/user_representer_test.exs6
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/pleroma/web/twitter_api/representers/user_representer.ex b/lib/pleroma/web/twitter_api/representers/user_representer.ex
index 8a7bb6f0d..a6595f349 100644
--- a/lib/pleroma/web/twitter_api/representers/user_representer.ex
+++ b/lib/pleroma/web/twitter_api/representers/user_representer.ex
@@ -18,7 +18,7 @@ defmodule Pleroma.Web.TwitterAPI.Representers.UserRepresenter do
"id" => user.id,
"name" => user.name,
"screen_name" => user.nickname,
- "description" => user.bio,
+ "description" => HtmlSanitizeEx.strip_tags(user.bio),
"following" => following,
"created_at" => created_at,
# Fake fields
diff --git a/test/web/twitter_api/representers/user_representer_test.exs b/test/web/twitter_api/representers/user_representer_test.exs
index d63f738a9..f62ce1da3 100644
--- a/test/web/twitter_api/representers/user_representer_test.exs
+++ b/test/web/twitter_api/representers/user_representer_test.exs
@@ -8,7 +8,7 @@ defmodule Pleroma.Web.TwitterAPI.Representers.UserRepresenterTest do
import Pleroma.Factory
setup do
- user = insert(:user)
+ user = insert(:user, bio: "<span>Here's some html</span>")
[user: user]
end
@@ -39,7 +39,7 @@ defmodule Pleroma.Web.TwitterAPI.Representers.UserRepresenterTest do
"id" => user.id,
"name" => user.name,
"screen_name" => user.nickname,
- "description" => user.bio,
+ "description" => HtmlSanitizeEx.strip_tags(user.bio),
"created_at" => created_at,
# Fake fields
"favourites_count" => 0,
@@ -66,7 +66,7 @@ defmodule Pleroma.Web.TwitterAPI.Representers.UserRepresenterTest do
"id" => user.id,
"name" => user.name,
"screen_name" => user.nickname,
- "description" => user.bio,
+ "description" => HtmlSanitizeEx.strip_tags(user.bio),
"created_at" => created_at,
# Fake fields
"favourites_count" => 0,