X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Fcommon_api.ex;h=4a7c9178dd76efa06080ff50ab0a9e062c0a7157;hb=142646426e1830ac0e0461075a99a27ac5813ceb;hp=1b5f8491efa0ddff51ce3d7769f50ec208df3a5a;hpb=f6d2bd738d6cf4c495ba8fcd311ebf4705cf4343;p=akkoma diff --git a/lib/pleroma/web/common_api.ex b/lib/pleroma/web/common_api.ex index 1b5f8491e..4a7c9178d 100644 --- a/lib/pleroma/web/common_api.ex +++ b/lib/pleroma/web/common_api.ex @@ -261,8 +261,7 @@ defmodule Pleroma.Web.CommonAPI do {:ok, activity, _} <- Pipeline.common_pipeline(emoji_react, local: true) do {:ok, activity} else - _ -> - {:error, dgettext("errors", "Could not add reaction emoji")} + _ -> {:error, dgettext("errors", "Could not add reaction emoji")} end end @@ -272,7 +271,7 @@ defmodule Pleroma.Web.CommonAPI do {:ok, activity, _} <- Pipeline.common_pipeline(undo, local: true) do {:ok, activity} else - _ -> + e -> {:error, dgettext("errors", "Could not remove reaction emoji")} end end @@ -397,7 +396,13 @@ defmodule Pleroma.Web.CommonAPI do 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?) + + unless draft.preview? do + Pleroma.Elasticsearch.maybe_put_into_elasticsearch(activity) + end + + activity end end @@ -487,9 +492,7 @@ defmodule Pleroma.Web.CommonAPI do else {what, result} = error -> Logger.warn( - "CommonAPI.remove_mute/2 failed. #{what}: #{result}, user_id: #{user_id}, activity_id: #{ - activity_id - }" + "CommonAPI.remove_mute/2 failed. #{what}: #{result}, user_id: #{user_id}, activity_id: #{activity_id}" ) {:error, error}