expose bubble instances via nodeinfo (#136)
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Reviewed-on: #136
This commit is contained in:
parent
55b86e45ec
commit
c3eea8dc7d
3 changed files with 23 additions and 2 deletions
|
@ -70,7 +70,8 @@ def get_nodeinfo("2.0") do
|
||||||
features: features,
|
features: features,
|
||||||
restrictedNicknames: Config.get([Pleroma.User, :restricted_nicknames]),
|
restrictedNicknames: Config.get([Pleroma.User, :restricted_nicknames]),
|
||||||
skipThreadContainment: Config.get([:instance, :skip_thread_containment], false),
|
skipThreadContainment: Config.get([:instance, :skip_thread_containment], false),
|
||||||
privilegedStaff: Config.get([:instance, :privileged_staff])
|
privilegedStaff: Config.get([:instance, :privileged_staff]),
|
||||||
|
localBubbleInstances: Config.get([:instance, :local_bubble], [])
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
|
@ -88,7 +88,8 @@ def raw_nodeinfo do
|
||||||
mailerEnabled: Config.get([Pleroma.Emails.Mailer, :enabled], false),
|
mailerEnabled: Config.get([Pleroma.Emails.Mailer, :enabled], false),
|
||||||
features: features,
|
features: features,
|
||||||
restrictedNicknames: Config.get([Pleroma.User, :restricted_nicknames]),
|
restrictedNicknames: Config.get([Pleroma.User, :restricted_nicknames]),
|
||||||
skipThreadContainment: Config.get([:instance, :skip_thread_containment], false)
|
skipThreadContainment: Config.get([:instance, :skip_thread_containment], false),
|
||||||
|
localBubbleInstances: Config.get([:instance, :local_bubble], [])
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
|
@ -188,6 +188,25 @@ test "shows extra information in the quarantined_info field for relevant entries
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
test "Bubble instances", %{conn: conn} do
|
||||||
|
clear_config([:instance, :local_bubble], [])
|
||||||
|
|
||||||
|
response =
|
||||||
|
conn
|
||||||
|
|> get("/nodeinfo/2.1.json")
|
||||||
|
|> json_response(:ok)
|
||||||
|
|
||||||
|
assert response["metadata"]["localBubbleInstances"] == []
|
||||||
|
clear_config([:instance, :local_bubble], ["example.com"])
|
||||||
|
|
||||||
|
response =
|
||||||
|
conn
|
||||||
|
|> get("/nodeinfo/2.1.json")
|
||||||
|
|> json_response(:ok)
|
||||||
|
|
||||||
|
assert response["metadata"]["localBubbleInstances"] == ["example.com"]
|
||||||
|
end
|
||||||
|
|
||||||
describe "MRF SimplePolicy" do
|
describe "MRF SimplePolicy" do
|
||||||
setup do
|
setup do
|
||||||
clear_config([:mrf, :policies], [Pleroma.Web.ActivityPub.MRF.SimplePolicy])
|
clear_config([:mrf, :policies], [Pleroma.Web.ActivityPub.MRF.SimplePolicy])
|
||||||
|
|
Loading…
Reference in a new issue