No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/changelog.d/well-known.change b/changelog.d/well-known.change
	new file mode 100644
	index 000000000..e928124fb
	--- /dev/null
	+++ b/changelog.d/well-known.change
	@@ -0,0 +1 @@
	+Accept application/activity+json for requests to .well-known/nodeinfo
	diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex
	index fc40a1143..4294dffa5 100644
	--- a/lib/pleroma/web/router.ex
	+++ b/lib/pleroma/web/router.ex
	@@ -189,7 +189,7 @@ defmodule Pleroma.Web.Router do
	end

	pipeline :well_known do
	- plug(:accepts, ["json", "jrd", "jrd+json", "xml", "xrd+xml"])
	+ plug(:accepts, ["activity+json", "json", "jrd", "jrd+json", "xml", "xrd+xml"])
	end

	pipeline :config do
	diff --git a/test/pleroma/web/node_info_test.exs b/test/pleroma/web/node_info_test.exs
	index f474220be..afe4ebb36 100644
	--- a/test/pleroma/web/node_info_test.exs
	+++ b/test/pleroma/web/node_info_test.exs
	@@ -24,6 +24,19 @@ defmodule Pleroma.Web.NodeInfoTest do
	\|> get(href)
	\|> json_response(200)
	end)
	+
	+ accept_types = [
	+ "application/activity+json",
	+ "application/json",
	+ "application/jrd+json"
	+ ]
	+
	+ for type <- accept_types do
	+ conn
	+ \|> put_req_header("accept", type)
	+ \|> get("/.well-known/nodeinfo")
	+ \|> json_response(200)
	+ end
	end

	test "nodeinfo shows staff accounts", %{conn: conn} do