fix emoji tests

[akkoma] / lib / pleroma / web / common_api.ex

diff --git a/lib/pleroma/web/common_api.ex b/lib/pleroma/web/common_api.ex
index 175d690cca93f66616f9c1919436efc216253193..4a7c9178dd76efa06080ff50ab0a9e062c0a7157 100644 (file)
--- a/lib/pleroma/web/common_api.ex
+++ b/lib/pleroma/web/common_api.ex
@@ -228,17 +228,7 @@ defmodule Pleroma.Web.CommonAPI do
       {:find_object, _} ->
         {:error, :not_found}
 
-      {:common_pipeline,
-       {
-         :error,
-         {
-           :validate_object,
-           {
-             :error,
-             changeset
-           }
-         }
-       }} = e ->
+      {:common_pipeline, {:error, {:validate, {:error, changeset}}}} = e ->
         if {:object, {"already liked by this actor", []}} in changeset.errors do
           {:ok, :already_liked}
         else
@@ -271,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
 
@@ -282,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
@@ -407,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
 
@@ -421,12 +416,11 @@ defmodule Pleroma.Web.CommonAPI do
          {:ok, _pin, _} <-
            Pipeline.common_pipeline(pin_data,
              local: true,
-             activity_id: id,
-             featured_address: user.featured_address
+             activity_id: id
            ) do
       {:ok, activity}
     else
-      {:error, {:execute_side_effects, error}} -> error
+      {:error, {:side_effects, error}} -> error
       error -> error
     end
   end
@@ -498,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}