Merge branch 'fix/pleroma.nginx' into 'develop'

[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 68d930a68c1f0040f35e2bc0ec90a07234f746d8..1d5918988822400da00be251f1948ca660a77f7e 100644 (file)
--- a/lib/pleroma/web/mastodon_api/views/account_view.ex
+++ b/lib/pleroma/web/mastodon_api/views/account_view.ex
@@ -3,8 +3,9 @@ defmodule Pleroma.Web.MastodonAPI.AccountView do
   alias Pleroma.User
   alias Pleroma.Web.MastodonAPI.AccountView
   alias Pleroma.Web.CommonAPI.Utils
+  alias Pleroma.Web.MediaProxy
 
-  defp image_url(%{"url" => [ %{ "href" => href } | t ]}), do: href
+  defp image_url(%{"url" => [ %{ "href" => href } | _ ]}), do: href
   defp image_url(_), do: nil
 
   def render("accounts.json", %{users: users} = opts) do
@@ -12,13 +13,13 @@ defmodule Pleroma.Web.MastodonAPI.AccountView do
   end
 
   def render("account.json", %{user: user}) do
-    image = User.avatar_url(user)
+    image = User.avatar_url(user) |> MediaProxy.url()
     user_info = User.user_info(user)
 
-    header = image_url(user.info["banner"]) || "https://placehold.it/700x335"
+    header = (image_url(user.info["banner"]) || "https://placehold.it/700x335") |> MediaProxy.url()
 
     %{
-      id: user.id,
+      id: to_string(user.id),
       username: hd(String.split(user.nickname, "@")),
       acct: user.nickname,
       display_name: user.name,
@@ -32,13 +33,18 @@ defmodule Pleroma.Web.MastodonAPI.AccountView do
       avatar: image,
       avatar_static: image,
       header: header,
-      header_static: header
+      header_static: header,
+      source: %{
+        note: "",
+        privacy: "public",
+        sensitive: "false"
+      }
     }
   end
 
   def render("mention.json", %{user: user}) do
     %{
-      id: user.id,
+      id: to_string(user.id),
       acct: user.nickname,
       username: hd(String.split(user.nickname, "@")),
       url: user.ap_id
@@ -47,10 +53,10 @@ defmodule Pleroma.Web.MastodonAPI.AccountView do
 
   def render("relationship.json", %{user: user, target: target}) do
     %{
-      id: target.id,
+      id: to_string(target.id),
       following: User.following?(user, target),
       followed_by: User.following?(target, user),
-      blocking: false,
+      blocking: User.blocks?(user, target),
       muting: false,
       requested: false,
       domain_blocking: false