Add [:instances_favicons, :enabled] setting, defaults to false

2020-07-08 05:56:24 +02:00 · 2020-07-08 05:56:24 +02:00 · 312fc55f14
commit 312fc55f14
parent 8c9df2d2e6
6 changed files with 53 additions and 6 deletions
--- a/lib/pleroma/web/mastodon_api/views/account_view.ex
+++ b/lib/pleroma/web/mastodon_api/views/account_view.ex
@ -205,12 +205,16 @@ defmodule Pleroma.Web.MastodonAPI.AccountView do
      end

    favicon =
-      user
-      |> Map.get(:ap_id, "")
-      |> URI.parse()
-      |> URI.merge("/")
-      |> Pleroma.Instances.Instance.get_or_update_favicon()
-      |> MediaProxy.url()
+      if Pleroma.Config.get([:instances_favicons, :enabled]) do
+        user
+        |> Map.get(:ap_id, "")
+        |> URI.parse()
+        |> URI.merge("/")
+        |> Pleroma.Instances.Instance.get_or_update_favicon()
+        |> MediaProxy.url()
+      else
+        nil
+      end

    %{
      id: to_string(user.id),