Add tag timelines.

[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 4e9ee413207e662e2ec7e0d05f5ff539cf6c16e1..f2fa49cb519a9edcab26c621133597ed1b8e9bcc 100644 (file)
--- a/lib/pleroma/web/mastodon_api/views/account_view.ex
+++ b/lib/pleroma/web/mastodon_api/views/account_view.ex
@@ -6,6 +6,10 @@ defmodule Pleroma.Web.MastodonAPI.AccountView do
   defp image_url(%{"url" => [ %{ "href" => href } | t ]}), do: href
   defp image_url(_), do: nil
 
+  def render("accounts.json", %{users: users} = opts) do
+    render_many(users, AccountView, "account.json", opts)
+  end
+
   def render("account.json", %{user: user}) do
     image = User.avatar_url(user)
     user_info = User.user_info(user)
@@ -22,7 +26,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,
@@ -43,8 +47,8 @@ defmodule Pleroma.Web.MastodonAPI.AccountView do
   def render("relationship.json", %{user: user, target: target}) do
     %{
       id: target.id,
-      following: User.following?(target, user),
-      followed_by: User.following?(user, target),
+      following: User.following?(user, target),
+      followed_by: User.following?(target, user),
       blocking: false,
       muting: false,
       requested: false,