1 files changed, 15 insertions, 0 deletions
diff --git a/lib/pleroma/web/activity_pub/utils.ex b/lib/pleroma/web/activity_pub/utils.ex
index 2e9ffe41c..6d74738f0 100644
--- a/lib/pleroma/web/activity_pub/utils.ex
+++ b/lib/pleroma/web/activity_pub/utils.ex
@@ -230,6 +230,21 @@ defmodule Pleroma.Web.ActivityPub.Utils do
     end)
   end
 
+  # Only federate user icon if not nil
+  # Prevents federating instance default avatars
+  def maybe_make_icon(user) do
+    if User.avatar_url_ap(user) do
+      %{
+        "icon" => %{
+          "type" => "Image",
+          "url" => User.avatar_url_ap(user)
+        }
+      }
+    else
+      []
+    end
+  end
+
   #### Like-related helpers
 
   @doc """