X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Fcommon_api.ex;h=95ac7b71a8a5394a0cf42b5d70f94b3d071b76c3;hb=449d8ff16572cb520b209476fea2a6dcb9312ac5;hp=6f685cb7ba570b117d768f34f79a1d1be8441e6c;hpb=eb1c7d75f4456440ef63e158f50fec6ed10c8918;p=akkoma

diff --git a/lib/pleroma/web/common_api.ex b/lib/pleroma/web/common_api.ex
index 6f685cb7b..95ac7b71a 100644
--- a/lib/pleroma/web/common_api.ex
+++ b/lib/pleroma/web/common_api.ex
@@ -16,6 +16,8 @@ defmodule Pleroma.Web.CommonAPI do
   alias Pleroma.Web.ActivityPub.Utils
   alias Pleroma.Web.ActivityPub.Visibility
   alias Pleroma.Web.CommonAPI.ActivityDraft
+  alias Pleroma.Elasticsearch
+  alias Pleroma.Config
 
   import Pleroma.Web.Gettext
   import Pleroma.Web.CommonAPI.Utils
@@ -395,9 +397,24 @@ defmodule Pleroma.Web.CommonAPI do
     end
   end
 
+  def maybe_put_into_elasticsearch({:ok, activity}) do
+    if Config.get([:search, :provider]) == :elasticsearch do
+      actor = Pleroma.Activity.user_actor(activity)
+      activity
+      |> Map.put(:user_actor, actor)
+      |> Elasticsearch.put()
+    end
+  end
+
+  def maybe_put_into_elasticsearch(_) do
+    {:ok, :skipped}
+  end
+
   def post(user, %{status: _} = data) do
     with {:ok, draft} <- ActivityDraft.create(user, data) do
-      ActivityPub.create(draft.changes, draft.preview?)
+      activity = ActivityPub.create(draft.changes, draft.preview?)
+      maybe_put_into_elasticsearch(activity)
+      activity
     end
   end