Fix merge conflicts with upstream

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

diff --git a/lib/pleroma/web/common_api.ex b/lib/pleroma/web/common_api.ex
index 3970c19a86b1e07e3ef190b3b32f029d4b2f6456..1b5f8491efa0ddff51ce3d7769f50ec208df3a5a 100644 (file)
--- a/lib/pleroma/web/common_api.ex
+++ b/lib/pleroma/web/common_api.ex
@@ -415,7 +415,7 @@ defmodule Pleroma.Web.CommonAPI do
            ) do
       {:ok, activity}
     else
-      {:error, {:execute_side_effects, error}} -> error
+      {:error, {:side_effects, error}} -> error
       error -> error
     end
   end