aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authoreal <eal@waifu.club>2018-08-08 08:38:25 +0300
committereal <eal@waifu.club>2018-08-08 08:38:25 +0300
commitcee63ad3f725a90fdd1a438520c33377cee8ad81 (patch)
treec971afa5380e7557847df2a8e03109ae131aa07b /lib
parentc2d1a5e9c4f4ef316a2833914c8f134c00c95b75 (diff)
downloadpleroma-cee63ad3f725a90fdd1a438520c33377cee8ad81.tar.gz
TwitterAPI user view: add screen_name_html and description_html.
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/twitter_api/views/user_view.ex14
1 files changed, 13 insertions, 1 deletions
diff --git a/lib/pleroma/web/twitter_api/views/user_view.ex b/lib/pleroma/web/twitter_api/views/user_view.ex
index 9c8460378..30cf266bd 100644
--- a/lib/pleroma/web/twitter_api/views/user_view.ex
+++ b/lib/pleroma/web/twitter_api/views/user_view.ex
@@ -1,6 +1,7 @@
defmodule Pleroma.Web.TwitterAPI.UserView do
use Pleroma.Web, :view
alias Pleroma.User
+ alias Pleroma.Formatter
alias Pleroma.Web.CommonAPI.Utils
alias Pleroma.Web.MediaProxy
@@ -28,9 +29,19 @@ defmodule Pleroma.Web.TwitterAPI.UserView do
user_info = User.get_cached_user_info(user)
+ emoji =
+ (user.info["source_data"]["tag"] || [])
+ |> Enum.filter(fn %{"type" => t} -> t == "Emoji" end)
+ |> Enum.map(fn %{"icon" => %{"url" => url}, "name" => name} ->
+ {String.trim(name, ":"), url}
+ end)
+
+ bio = HtmlSanitizeEx.strip_tags(user.bio)
+
data = %{
"created_at" => user.inserted_at |> Utils.format_naive_asctime(),
- "description" => HtmlSanitizeEx.strip_tags(user.bio),
+ "description" => bio,
+ "description_html" => bio |> Formatter.emojify(emoji),
"favourites_count" => 0,
"followers_count" => user_info[:follower_count],
"following" => following,
@@ -47,6 +58,7 @@ defmodule Pleroma.Web.TwitterAPI.UserView do
"delete_others_notice" => !!user.info["is_moderator"]
},
"screen_name" => user.nickname,
+ "screen_name_html" => Formatter.emojify(user.nickname, emoji),
"statuses_count" => user_info[:note_count],
"statusnet_profile_url" => user.ap_id,
"cover_photo" => User.banner_url(user) |> MediaProxy.url(),