X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Fcommon_api.ex;h=3266b1c607017676a00dcb8dd2d45969b8e74a46;hb=3252ed0f544bf5e1cc6d3e09bfa1a4866889ec91;hp=0c93b1976950ddd58926d8c67d5d821b9e9e4db2;hpb=de60b1f3c1f1b49da757f21260a648cab0709c3f;p=akkoma

diff --git a/lib/pleroma/web/common_api.ex b/lib/pleroma/web/common_api.ex
index 0c93b1976..3266b1c60 100644
--- a/lib/pleroma/web/common_api.ex
+++ b/lib/pleroma/web/common_api.ex
@@ -16,8 +16,6 @@ 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
@@ -397,24 +395,14 @@ defmodule Pleroma.Web.CommonAPI do
     end
   end
 
-  def maybe_put_into_elasticsearch({:ok, activity}) do
-    if Config.get([:search, :provider]) == Pleroma.Search.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
       activity = ActivityPub.create(draft.changes, draft.preview?)
-      maybe_put_into_elasticsearch(activity)
+
+      unless draft.preview? do
+        Pleroma.Elasticsearch.maybe_put_into_elasticsearch(activity)
+      end
+
       activity
     end
   end