X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Fcommon_api.ex;h=f6a131c21bc4d2fc2b014b4597484da81cf43607;hb=f341e686221598612670c712f754f44cf4e9baed;hp=0c93b1976950ddd58926d8c67d5d821b9e9e4db2;hpb=fdeef7d4df2c70245941d2051e02529c13f3b505;p=akkoma diff --git a/lib/pleroma/web/common_api.ex b/lib/pleroma/web/common_api.ex index 0c93b1976..f6a131c21 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,12 @@ 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