Add media upload endpoint.

[akkoma] / lib / pleroma / web / mastodon_api / views / account_view.ex

diff --git a/lib/pleroma/web/mastodon_api/views/account_view.ex b/lib/pleroma/web/mastodon_api/views/account_view.ex
index 35a130b1edba6ef57e5389841101289e00d1ecfe..22a7dddf85aa895bdb80982a92ec994f53e7b903 100644 (file)
--- a/lib/pleroma/web/mastodon_api/views/account_view.ex
+++ b/lib/pleroma/web/mastodon_api/views/account_view.ex
@@ -1,6 +1,7 @@
 defmodule Pleroma.Web.MastodonAPI.AccountView do
   use Pleroma.Web, :view
   alias Pleroma.User
+  alias Pleroma.Web.MastodonAPI.AccountView
 
   defp image_url(%{"url" => [ %{ "href" => href } | t ]}), do: href
   defp image_url(_), do: nil
@@ -13,7 +14,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountView do
 
     %{
       id: user.id,
-      username: user.nickname,
+      username: hd(String.split(user.nickname, "@")),
       acct: user.nickname,
       display_name: user.name,
       locked: false,
@@ -21,7 +22,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountView do
       followers_count: user_info.follower_count,
       following_count: user_info.following_count,
       statuses_count: user_info.note_count,
-      note: user.bio,
+      note: user.bio || "",
       url: user.ap_id,
       avatar: image,
       avatar_static: image,
@@ -34,8 +35,24 @@ defmodule Pleroma.Web.MastodonAPI.AccountView do
     %{
       id: user.id,
       acct: user.nickname,
-      username: user.nickname,
+      username: hd(String.split(user.nickname, "@")),
       url: user.ap_id
     }
   end
+
+  def render("relationship.json", %{user: user, target: target}) do
+    %{
+      id: target.id,
+      following: User.following?(user, target),
+      followed_by: User.following?(target, user),
+      blocking: false,
+      muting: false,
+      requested: false,
+      domain_blocking: false
+    }
+  end
+
+  def render("relationships.json", %{user: user, targets: targets}) do
+    render_many(targets, AccountView, "relationship.json", user: user, as: :target)
+  end
 end