hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Return maps in node_info

Browse source 
It's easiest (and imo most proper) to use tuples {"instance, "reason"} in BE,
but for FE maps like %{"instance": "instance", "reason", "reason"} are better.
I changed it so that node_info returns maps now for simple_policy and quarantined instances.
This commit is contained in:
Ilja 2020-10-23 20:27:13 +02:00 • committed by Haelwenn (lanodan) Monnier
commit 7fdc3cde06
No known key found for this signature in database
GPG key ID: D5B7A8E43C997DEE
3 changed files with 26 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

20
test/pleroma/web/node_info_test.exs
View file

@ -150,6 +150,22 @@ defmodule Pleroma.Web.NodeInfoTest do
)
end
test "it shows quarantined instances data if enabled", %{conn: conn} do
clear_config([:mrf, :transparency], true)
quarantined_instances = [{"example.com", ""}]
clear_config([:instance, :quarantined_instances], quarantined_instances)
expected_config = [%{"instance" => "example.com", "reason" => ""}]
response =
conn
|> get("/nodeinfo/2.1.json")
|> json_response(:ok)
assert response["metadata"]["federation"]["quarantined_instances"] == expected_config
end
test "it shows MRF transparency data if enabled", %{conn: conn} do
clear_config([:mrf, :policies], [Pleroma.Web.ActivityPub.MRF.SimplePolicy])
clear_config([:mrf, :transparency], true)
@ -157,7 +173,7 @@ defmodule Pleroma.Web.NodeInfoTest do
simple_config = %{"reject" => [{"example.com", ""}]}
clear_config(:mrf_simple, simple_config)
expected_config = %{"reject" => [["example.com", ""]]}
expected_config = %{"reject" => [%{"instance" => "example.com", "reason" => ""}]}
response =
conn
@ -175,7 +191,7 @@ defmodule Pleroma.Web.NodeInfoTest do
simple_config = %{"reject" => [{"example.com", ""}, {"other.site", ""}]}
clear_config(:mrf_simple, simple_config)
expected_config = %{"reject" => [["example.com", ""]]}
expected_config = %{"reject" => [%{"instance" => "example.com", "reason" => ""}]}
response =
conn