Merge branch 'release/2.2.0' into 'stable'v2.2.0

Release/2.2.0

See merge request pleroma/secteam/pleroma!19

1 files changed, 0 insertions, 26 deletions

diff --git a/lib/pleroma/web/preload/user.ex b/lib/pleroma/web/preload/user.ex
deleted file mode 100644
index b3d2e9b8d..000000000
--- a/lib/pleroma/web/preload/user.ex
+++ /dev/null
@@ -1,26 +0,0 @@
-# Pleroma: A lightweight social networking server
-# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
-# 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_base "/api/v1/accounts"
-
-  @impl Provider
-  def generate_terms(%{user: user}) do
-    build_accounts_tag(%{}, user)
-  end
-
-  def generate_terms(_params), do: %{}
-
-  def build_accounts_tag(acc, %User{} = user) do
-    account_data = AccountView.render("show.json", %{user: user, for: user})
-    Map.put(acc, "#{@account_url_base}/#{user.id}", account_data)
-  end
-
-  def build_accounts_tag(acc, _), do: acc
-end