From cee63ad3f725a90fdd1a438520c33377cee8ad81 Mon Sep 17 00:00:00 2001
From: eal <eal@waifu.club>
Date: Wed, 8 Aug 2018 08:38:25 +0300
Subject: [PATCH] TwitterAPI user view: add screen_name_html and
 description_html.

---
 lib/pleroma/web/twitter_api/views/user_view.ex | 14 +++++++++++++-
 test/web/twitter_api/views/user_view_test.exs  |  8 ++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

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 @@ def render("user.json", %{user: user = %User{}} = assigns) 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 @@ def render("user.json", %{user: user = %User{}} = assigns) 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(),
diff --git a/test/web/twitter_api/views/user_view_test.exs b/test/web/twitter_api/views/user_view_test.exs
index 49f73c2fe..000c589af 100644
--- a/test/web/twitter_api/views/user_view_test.exs
+++ b/test/web/twitter_api/views/user_view_test.exs
@@ -40,7 +40,9 @@ test "A user" do
       "id" => user.id,
       "name" => user.name,
       "screen_name" => user.nickname,
+      "screen_name_html" => user.nickname,
       "description" => HtmlSanitizeEx.strip_tags(user.bio),
+      "description_html" => HtmlSanitizeEx.strip_tags(user.bio),
       "created_at" => user.inserted_at |> Utils.format_naive_asctime(),
       "favourites_count" => 0,
       "statuses_count" => 1,
@@ -77,7 +79,9 @@ test "A user for a given other follower", %{user: user} do
       "id" => user.id,
       "name" => user.name,
       "screen_name" => user.nickname,
+      "screen_name_html" => user.nickname,
       "description" => HtmlSanitizeEx.strip_tags(user.bio),
+      "description_html" => HtmlSanitizeEx.strip_tags(user.bio),
       "created_at" => user.inserted_at |> Utils.format_naive_asctime(),
       "favourites_count" => 0,
       "statuses_count" => 0,
@@ -115,7 +119,9 @@ test "A user that follows you", %{user: user} do
       "id" => follower.id,
       "name" => follower.name,
       "screen_name" => follower.nickname,
+      "screen_name_html" => follower.nickname,
       "description" => HtmlSanitizeEx.strip_tags(follower.bio),
+      "description_html" => HtmlSanitizeEx.strip_tags(follower.bio),
       "created_at" => follower.inserted_at |> Utils.format_naive_asctime(),
       "favourites_count" => 0,
       "statuses_count" => 0,
@@ -160,7 +166,9 @@ test "A blocked user for the blocker" do
       "id" => user.id,
       "name" => user.name,
       "screen_name" => user.nickname,
+      "screen_name_html" => user.nickname,
       "description" => HtmlSanitizeEx.strip_tags(user.bio),
+      "description_html" => HtmlSanitizeEx.strip_tags(user.bio),
       "created_at" => user.inserted_at |> Utils.format_naive_asctime(),
       "favourites_count" => 0,
       "statuses_count" => 0,