Merge remote-tracking branch 'pleroma/develop' into object-tombstone-visibility

[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..1b5f8491efa0ddff51ce3d7769f50ec208df3a5a 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
@@ -421,12 +411,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