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

diff --combined lib/pleroma/web/activity_pub/pipeline.ex
index eed53cd34e4026f54e6997f4331ab1a647f35f8e,0068d60be69bc5ab861773e70892bd31430ba01d..7ccee54c9d829d14204bde726a2958c6e41c54c5
--- 1/lib/pleroma/web/activity_pub/pipeline.ex
--- 2/lib/pleroma/web/activity_pub/pipeline.ex
+++ b/lib/pleroma/web/activity_pub/pipeline.ex
@@@ -1,5 -1,5 +1,5 @@@
  # Pleroma: A lightweight social networking server
 -# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
 +# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
  # SPDX-License-Identifier: AGPL-3.0-only
  
  defmodule Pleroma.Web.ActivityPub.Pipeline do
@@@ -22,6 -22,7 +22,7 @@@
           {_, {:ok, _}} <- {:federation, maybe_federate(activity, meta)} do
        {:ok, activity, meta}
      else
+       {:mrf_object, {:reject, _}} -> {:ok, nil, meta}
        e -> {:error, e}
      end
    end