Don't reject already accepted subscriptions.

[akkoma] / lib / pleroma / web / twitter_api / views / user_view.ex

diff --git a/lib/pleroma/web/twitter_api/views/user_view.ex b/lib/pleroma/web/twitter_api/views/user_view.ex
index fdab5be3110f9391af7a118f5b8500f936d2e6bc..f72e951eb1dd276fe127fefe4b70521fdfaa6a96 100644 (file)
--- a/lib/pleroma/web/twitter_api/views/user_view.ex
+++ b/lib/pleroma/web/twitter_api/views/user_view.ex
@@ -1,9 +1,20 @@
 defmodule Pleroma.Web.TwitterAPI.UserView do
   use Pleroma.Web, :view
   alias Pleroma.User
-  alias Pleroma.Web.TwitterAPI.Utils
+  alias Pleroma.Web.CommonAPI.Utils
 
   def render("show.json", %{user: user = %User{}} = assigns) do
+    render_one(user, Pleroma.Web.TwitterAPI.UserView, "user.json", assigns)
+  end
+
+  def render("index.json", %{users: users, for: user}) do
+    render_many(users, Pleroma.Web.TwitterAPI.UserView, "user.json", for: user)
+  end
+
+  defp image_url(%{"url" => [ %{ "href" => href } | t ]}), do: href
+  defp image_url(_), do: nil
+
+  def render("user.json", %{user: user = %User{}} = assigns) do
     image = User.avatar_url(user)
     following = if assigns[:for] do
       User.following?(assigns[:for], user)
@@ -29,7 +40,9 @@ defmodule Pleroma.Web.TwitterAPI.UserView do
       "rights" => %{},
       "screen_name" => user.nickname,
       "statuses_count" => user_info[:note_count],
-      "statusnet_profile_url" => user.ap_id
+      "statusnet_profile_url" => user.ap_id,
+      "cover_photo" => image_url(user.info["banner"]),
+      "background_image" => image_url(user.info["background"])
     }
   end