expose bubble instances via nodeinfo (#136)
ci/woodpecker/push/woodpecker Pipeline was successful Details

Reviewed-on: #136
This commit is contained in:
floatingghost 2022-08-02 09:11:22 +00:00
parent 55b86e45ec
commit c3eea8dc7d
3 changed files with 23 additions and 2 deletions

View File

@ -70,7 +70,8 @@ defmodule Pleroma.Web.Nodeinfo.Nodeinfo 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

View File

@ -88,7 +88,8 @@ defmodule Pleroma.Web.Nodeinfo.NodeinfoController 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

View File

@ -188,6 +188,25 @@ defmodule Pleroma.Web.NodeInfoTest do
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])