Move finmojis to representation.

[akkoma] / lib / pleroma / web / twitter_api / representers / user_representer.ex

diff --git a/lib/pleroma/web/twitter_api/representers/user_representer.ex b/lib/pleroma/web/twitter_api/representers/user_representer.ex
index f358baf3c6d38b8d119ab370641db3416b12bb4b..a6595f349029d6c78eb1562acd878506c065cc44 100644 (file)
--- a/lib/pleroma/web/twitter_api/representers/user_representer.ex
+++ b/lib/pleroma/web/twitter_api/representers/user_representer.ex
@@ -4,25 +4,23 @@ defmodule Pleroma.Web.TwitterAPI.Representers.UserRepresenter do
   alias Pleroma.User
 
   def to_map(user, opts) do
-    image = case user.avatar do
-      %{"url" => [%{"href" => href} | _]} -> href
-      _ -> "https://placehold.it/48x48"
-    end
-
+    image = User.avatar_url(user)
     following = if opts[:for] do
       User.following?(opts[:for], user)
     else
       false
     end
 
-    user_info = User.user_info(user)
+    user_info = User.get_cached_user_info(user)
+    created_at = user.inserted_at |> DateTime.from_naive!("Etc/UTC") |> format_asctime
 
     map = %{
       "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
       "favourites_count" => 0,
       "statuses_count" => user_info[:note_count],
@@ -32,7 +30,8 @@ defmodule Pleroma.Web.TwitterAPI.Representers.UserRepresenter do
       "profile_image_url_https" => image,
       "profile_image_url_profile_size" => image,
       "profile_image_url_original" => image,
-      "rights" => %{}
+      "rights" => %{},
+      "statusnet_profile_url" => user.ap_id
     }
 
     map