X-Git-Url: https://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Factivity_pub%2Fpipeline.ex;h=a0f2e0312642ac431a8a5ffa9dd5bd906e623702;hb=377f84f3678f9c2541fbd4a200cd93c5ab0dea24;hp=e184a937621595cd0444db0bc8f10949f4adc811;hpb=37a7f521fd4778cde48f1b003ad9695e6ea45d1f;p=akkoma

diff --git a/lib/pleroma/web/activity_pub/pipeline.ex b/lib/pleroma/web/activity_pub/pipeline.ex
index e184a9376..a0f2e0312 100644
--- a/lib/pleroma/web/activity_pub/pipeline.ex
+++ b/lib/pleroma/web/activity_pub/pipeline.ex
@@ -7,6 +7,7 @@ defmodule Pleroma.Web.ActivityPub.Pipeline do
   alias Pleroma.Config
   alias Pleroma.Object
   alias Pleroma.Repo
+  alias Pleroma.Utils
   alias Pleroma.Web.ActivityPub.ActivityPub
   alias Pleroma.Web.ActivityPub.MRF
   alias Pleroma.Web.ActivityPub.ObjectValidator
@@ -24,7 +25,7 @@ defmodule Pleroma.Web.ActivityPub.Pipeline do
   @spec common_pipeline(map(), keyword()) ::
           {:ok, Activity.t() | Object.t(), keyword()} | {:error, any()}
   def common_pipeline(object, meta) do
-    case Repo.transaction(fn -> do_common_pipeline(object, meta) end) do
+    case Repo.transaction(fn -> do_common_pipeline(object, meta) end, Utils.query_timeout()) do
       {:ok, {:ok, activity, meta}} ->
         @side_effects.handle_after_transaction(meta)
         {:ok, activity, meta}
@@ -44,7 +45,6 @@ defmodule Pleroma.Web.ActivityPub.Pipeline do
 
   def do_common_pipeline(message, meta) do
     with {_, {:ok, message, meta}} <- {:validate, @object_validator.validate(message, meta)},
-         {_, {:ok, message, meta}} <- {:fixup, validation_fixups(message, meta)},
          {_, {:ok, message, meta}} <- {:mrf, @mrf.pipeline_filter(message, meta)},
          {_, {:ok, message, meta}} <- {:persist, @activity_pub.persist(message, meta)},
          {_, {:ok, message, meta}} <- {:side_effects, @side_effects.handle(message, meta)},
@@ -56,19 +56,6 @@ defmodule Pleroma.Web.ActivityPub.Pipeline do
     end
   end
 
-  defp validation_fixups(message, meta) do
-    # Insert copy of hashtags as strings for the non-hashtag table indexing
-    message =
-      if message["tag"] do
-        tag = Object.hashtags(%Object{data: message}) ++ (message["tag"] || [])
-        Map.put(message, "tag", tag)
-      else
-        message
-      end
-
-    {:ok, message, meta}
-  end
-
   defp maybe_federate(%Object{}, _), do: {:ok, :not_federated}
 
   defp maybe_federate(%Activity{} = activity, meta) do