aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/activity_pub/pipeline.ex
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-04-29 13:45:50 +0200
committerlain <lain@soykaf.club>2020-04-29 13:45:50 +0200
commite055b8d2036e18a95d84f6f1db08fc465fe9975d (patch)
treedf8176461f0e1c1392b5d21c8e17e2600495873c /lib/pleroma/web/activity_pub/pipeline.ex
parent67659afe487def6bd4e0ccfbf8d015fda2a8ac61 (diff)
downloadpleroma-e055b8d2036e18a95d84f6f1db08fc465fe9975d.tar.gz
Pipeline: Always run common_pipeline in a transaction for now.
Diffstat (limited to 'lib/pleroma/web/activity_pub/pipeline.ex')
-rw-r--r--lib/pleroma/web/activity_pub/pipeline.ex11
1 files changed, 11 insertions, 0 deletions
diff --git a/lib/pleroma/web/activity_pub/pipeline.ex b/lib/pleroma/web/activity_pub/pipeline.ex
index 4213ba751..d5abb7567 100644
--- a/lib/pleroma/web/activity_pub/pipeline.ex
+++ b/lib/pleroma/web/activity_pub/pipeline.ex
@@ -5,6 +5,7 @@
defmodule Pleroma.Web.ActivityPub.Pipeline do
alias Pleroma.Activity
alias Pleroma.Object
+ alias Pleroma.Repo
alias Pleroma.Web.ActivityPub.ActivityPub
alias Pleroma.Web.ActivityPub.MRF
alias Pleroma.Web.ActivityPub.ObjectValidator
@@ -14,6 +15,16 @@ 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
+ {:ok, value} ->
+ value
+
+ {:error, e} ->
+ {:error, e}
+ end
+ end
+
+ def do_common_pipeline(object, meta) do
with {_, {:ok, validated_object, meta}} <-
{:validate_object, ObjectValidator.validate(object, meta)},
{_, {:ok, mrfd_object}} <- {:mrf_object, MRF.filter(validated_object)},