moon
/
spc-pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'remake-remodel-2' of git.pleroma.social:pleroma/pleroma into remake-remodel-2

This commit is contained in:
lain 2020-03-26 17:24:10 +01:00
parent 0c60c0a76a 69fc1dd69f
commit 29ab1d9f8d
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/pleroma/web/activity_pub/pipeline.ex
View File

@ -22,6 +22,7 @@ def common_pipeline(object, meta) do
{_, {:ok, _}} <- {:federation, maybe_federate(activity, meta)} do {_, {:ok, _}} <- {:federation, maybe_federate(activity, meta)} do
{:ok, activity, meta} {:ok, activity, meta}
else else
{:mrf_object, {:reject, _}} -> {:ok, nil, meta}
e -> {:error, e} e -> {:error, e}
end end
end end