logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma git clone https://hacktivis.me/git/pleroma.git
commit: 4ae17c62944eab89acfa96a0912819093c872436
parent 62856ab18f8992fb73cb27db40bbea9f29b5d1b6
Author: Mark Felder <feld@feld.me>
Date:   Fri, 30 Aug 2024 15:25:21 -0400

NodeInfo: Accept application/activity+json requests

Diffstat:

Achangelog.d/well-known.change1+
Mlib/pleroma/web/router.ex2+-
Mtest/pleroma/web/node_info_test.exs13+++++++++++++
3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/changelog.d/well-known.change 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 @@ -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 @@ -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