Merge branch 'develop' into global-status-expiration

[akkoma] / lib / pleroma / activity.ex

diff --git a/lib/pleroma/activity.ex b/lib/pleroma/activity.ex
index bbaa561a77804b933656f34d61cb87a230fce8bd..5a8329e69368de5c03e1ed4fc7ad22de7f7e6ad2 100644 (file)
--- a/lib/pleroma/activity.ex
+++ b/lib/pleroma/activity.ex
@@ -95,6 +95,7 @@ defmodule Pleroma.Activity do
     |> preload([activity, object: object], object: object)
   end
 
+  # Note: applies to fake activities (ActivityPub.Utils.get_notified_from_object/1 etc.)
   def user_actor(%Activity{actor: nil}), do: nil
 
   def user_actor(%Activity{} = activity) do