Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop

[akkoma] / lib / pleroma / object.ex

diff --git a/lib/pleroma/object.ex b/lib/pleroma/object.ex
index 3f1d0fea1f28e67651195f337c09f9f16cf214c2..740d687a3505fc03ea0cc2161aa44bba4a5f8872 100644 (file)
--- a/lib/pleroma/object.ex
+++ b/lib/pleroma/object.ex
@@ -44,6 +44,7 @@ defmodule Pleroma.Object do
   def normalize(_, fetch_remote \\ true)
   # If we pass an Activity to Object.normalize(), we can try to use the preloaded object.
   # Use this whenever possible, especially when walking graphs in an O(N) loop!
+  def normalize(%Object{} = object, _), do: object
   def normalize(%Activity{object: %Object{} = object}, _), do: object
 
   # A hack for fake activities