Merge branch 'develop' into refactor/notification_settings

[akkoma] / lib / pleroma / web / preload / user.ex

diff --git a/lib/pleroma/web/preload/user.ex b/lib/pleroma/web/preload/user.ex
index 3a244845b499f0d9221815465eeafa0f32726240..b3d2e9b8dd25efa6f2d90e3fef4a6a7ec8c8a085 100644 (file)
--- a/lib/pleroma/web/preload/user.ex
+++ b/lib/pleroma/web/preload/user.ex
@@ -3,11 +3,12 @@
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Web.Preload.Providers.User do
+  alias Pleroma.User
   alias Pleroma.Web.MastodonAPI.AccountView
   alias Pleroma.Web.Preload.Providers.Provider
 
   @behaviour Provider
-  @account_url :"/api/v1/accounts"
+  @account_url_base "/api/v1/accounts"
 
   @impl Provider
   def generate_terms(%{user: user}) do
@@ -16,10 +17,10 @@ defmodule Pleroma.Web.Preload.Providers.User do
 
   def generate_terms(_params), do: %{}
 
-  def build_accounts_tag(acc, nil), do: acc
-
-  def build_accounts_tag(acc, user) do
+  def build_accounts_tag(acc, %User{} = user) do
     account_data = AccountView.render("show.json", %{user: user, for: user})
-    Map.put(acc, @account_url, account_data)
+    Map.put(acc, "#{@account_url_base}/#{user.id}", account_data)
   end
+
+  def build_accounts_tag(acc, _), do: acc
 end