Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue

diff --cc config/config.exs
Simple merge

diff --cc config/test.exs
Simple merge

diff --cc docs/config.md
Simple merge

diff --cc lib/pleroma/application.ex
Simple merge

diff --cc lib/pleroma/web/activity_pub/utils.ex
Simple merge

diff --cc mix.exs
Simple merge

diff --cc mix.lock
Simple merge

diff --cc test/user_test.exs
Simple merge

diff --cc test/web/activity_pub/activity_pub_controller_test.exs
Simple merge

diff --cc test/web/federator_test.exs
index ebe962da2958834134658fc4d1128b65e727f647,73cfaa8f1ec96dbb681ba44ccd4427dfd1a139ed..d3a28d50e72e129165b2d04d2b0d71f72947ba5e
--- 1/test/web/federator_test.exs
--- 2/test/web/federator_test.exs
+++ b/test/web/federator_test.exs
@@@ -235,8 -227,23 +235,24 @@@ defmodule Pleroma.Web.FederatorTest d
          "to" => ["https://www.w3.org/ns/activitystreams#Public"]
        }
  
 -      :error = Federator.incoming_ap_doc(params)
 +      assert {:ok, job} = Federator.incoming_ap_doc(params)
 +      assert :error = ObanHelpers.perform(job)
      end
+ 
+     test "it does not crash if MRF rejects the post" do
+       policies = Pleroma.Config.get([:instance, :rewrite_policy])
+       mrf_keyword_policy = Pleroma.Config.get(:mrf_keyword)
+       Pleroma.Config.put([:mrf_keyword, :reject], ["lain"])
+       Pleroma.Config.put([:instance, :rewrite_policy], Pleroma.Web.ActivityPub.MRF.KeywordPolicy)
+ 
+       params =
+         File.read!("test/fixtures/mastodon-post-activity.json")
+         |> Poison.decode!()
+ 
+       assert Federator.incoming_ap_doc(params) == :error
+ 
+       Pleroma.Config.put([:instance, :rewrite_policy], policies)
+       Pleroma.Config.put(:mrf_keyword, mrf_keyword_policy)
+     end
    end
  end