Merge branch 'develop' into dtluna/pleroma-feature/unfollow-activity

[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 8875d26ff8ca6c316fba207565f184a259e99597..4930774138d8861f287eb48ede8a737328144001 100644 (file)
--- a/lib/pleroma/web/twitter_api/representers/user_representer.ex
+++ b/lib/pleroma/web/twitter_api/representers/user_representer.ex
@@ -1,17 +1,18 @@
 defmodule Pleroma.Web.TwitterAPI.Representers.UserRepresenter do
   use Pleroma.Web.TwitterAPI.Representers.BaseRepresenter
-  alias Pleroma.User
-
-  def to_map(user, opts \\ %{}) do
 
-    image = "https://placehold.it/48x48"
+  alias Pleroma.User
 
+  def to_map(user, opts) do
+    image = User.avatar_url(user)
     following = if opts[:for] do
       User.following?(opts[:for], user)
     else
       false
     end
 
+    user_info = User.get_cached_user_info(user)
+
     map = %{
       "id" => user.id,
       "name" => user.name,
@@ -20,14 +21,15 @@ defmodule Pleroma.Web.TwitterAPI.Representers.UserRepresenter do
       "following" => following,
       # Fake fields
       "favourites_count" => 0,
-      "statuses_count" => 0,
-      "friends_count" => 0,
-      "followers_count" => 0,
+      "statuses_count" => user_info[:note_count],
+      "friends_count" => user_info[:following_count],
+      "followers_count" => user_info[:follower_count],
       "profile_image_url" => image,
       "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