Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/help-test

[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 079e250210e47431a23c6cf71040a9766a48a36d..2ee4ee25443a00bc2a9d9dd16b8c5d20f5f777e7 100644 (file)
--- a/lib/pleroma/web/twitter_api/representers/user_representer.ex
+++ b/lib/pleroma/web/twitter_api/representers/user_representer.ex
@@ -1,14 +1,26 @@
 defmodule Pleroma.Web.TwitterAPI.Representers.UserRepresenter do
   use Pleroma.Web.TwitterAPI.Representers.BaseRepresenter
 
-  def to_map(user, options) do
-    image = "https://placehold.it/48x48"
+  alias Pleroma.User
+
+  def to_map(user, opts) do
+    image = case user.avatar do
+      %{"url" => [%{"href" => href} | _]} -> href
+      _ -> "https://placehold.it/48x48"
+    end
+
+    following = if opts[:for] do
+      User.following?(opts[:for], user)
+    else
+      false
+    end
+
     map = %{
       "id" => user.id,
       "name" => user.name,
       "screen_name" => user.nickname,
       "description" => user.bio,
-      "following" => false,
+      "following" => following,
       # Fake fields
       "favourites_count" => 0,
       "statuses_count" => 0,