Merge branch 'remake-remodel-2' of git.pleroma.social:pleroma/pleroma into remake-remodel-2
这个提交包含在:
当前提交
29ab1d9f8d
@ -22,6 +22,7 @@ defmodule Pleroma.Web.ActivityPub.Pipeline do
|
||||
{_, {:ok, _}} <- {:federation, maybe_federate(activity, meta)} do
|
||||
{:ok, activity, meta}
|
||||
else
|
||||
{:mrf_object, {:reject, _}} -> {:ok, nil, meta}
|
||||
e -> {:error, e}
|
||||
end
|
||||
end
|
||||
|
正在加载...
在新工单中引用
屏蔽一个用户