projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'feature/peertube_2' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
twitter_api
/
views
/
user_view.ex
diff --git
a/lib/pleroma/web/twitter_api/views/user_view.ex
b/lib/pleroma/web/twitter_api/views/user_view.ex
index 7d0f0e7039c9df5d0b77c35e463559615b440181..25fda1aa80af3cf017f9c9977d10d392af122124 100644
(file)
--- a/
lib/pleroma/web/twitter_api/views/user_view.ex
+++ b/
lib/pleroma/web/twitter_api/views/user_view.ex
@@
-36,12
+36,10
@@
defmodule Pleroma.Web.TwitterAPI.UserView do
{String.trim(name, ":"), url}
end)
{String.trim(name, ":"), url}
end)
- bio = HtmlSanitizeEx.strip_tags(user.bio)
-
data = %{
"created_at" => user.inserted_at |> Utils.format_naive_asctime(),
data = %{
"created_at" => user.inserted_at |> Utils.format_naive_asctime(),
- "description" =>
bio
,
- "description_html" =>
bio |> Formatter.emojify(emoji
),
+ "description" =>
HtmlSanitizeEx.strip_tags(user.bio |> String.replace("<br>", "\n"))
,
+ "description_html" =>
HtmlSanitizeEx.basic_html(user.bio
),
"favourites_count" => 0,
"followers_count" => user_info[:follower_count],
"following" => following,
"favourites_count" => 0,
"followers_count" => user_info[:follower_count],
"following" => following,