mirrors/pleroma
1
0
Fork 0
mirror of https://git.pleroma.social/pleroma/pleroma.git synced 2024-12-21 23:56:30 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'well-known' into 'develop'

Browse source 
NodeInfo: Accept application/activity+json requests

See merge request pleroma/pleroma!4242
This commit is contained in:
feld 2024-09-06 16:30:07 +00:00 committed by Haelwenn (lanodan) Monnier
parent ced6b10c70
commit 2977779e94
No known key found for this signature in database
3 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/well-known.change Normal file
View file

@ -0,0 +1 @@
Accept application/activity+json for requests to .well-known/nodeinfo

2
lib/pleroma/web/router.ex
View file

@ -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

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

@ -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