diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2024-01-17 09:51:56 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2024-01-17 09:51:56 +0000 |
| commit | 4c20713ecde9d429db937d3d66d4862bfb0456f5 (patch) | |
| tree | 9f64c2f875f7f72b0728db95a9f4da60f308e284 /lib | |
| parent | 9b39bc6aa8238ab2084f813d50210b75bd80e374 (diff) | |
| parent | 355487041a610a2834eebca520660b74a667df06 (diff) | |
| download | pleroma-4c20713ecde9d429db937d3d66d4862bfb0456f5.tar.gz pleroma-4c20713ecde9d429db937d3d66d4862bfb0456f5.zip | |
Merge branch 'otp26' into 'develop'
OTP26 support
See merge request pleroma/pleroma!4025
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/router.ex | 2 | ||||
| -rw-r--r-- | lib/pleroma/web/web_finger/web_finger_controller.ex | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex index 00268b121..8ba845364 100644 --- a/lib/pleroma/web/router.ex +++ b/lib/pleroma/web/router.ex @@ -182,7 +182,7 @@ defmodule Pleroma.Web.Router do end pipeline :well_known do - plug(:accepts, ["json", "jrd+json", "xml", "xrd+xml"]) + plug(:accepts, ["json", "jrd", "jrd+json", "xml", "xrd+xml"]) end pipeline :config do diff --git a/lib/pleroma/web/web_finger/web_finger_controller.ex b/lib/pleroma/web/web_finger/web_finger_controller.ex index 9e5efb77f..021df9bc5 100644 --- a/lib/pleroma/web/web_finger/web_finger_controller.ex +++ b/lib/pleroma/web/web_finger/web_finger_controller.ex @@ -30,7 +30,7 @@ defmodule Pleroma.Web.WebFinger.WebFingerController do end def webfinger(%{assigns: %{format: format}} = conn, %{"resource" => resource}) - when format in ["json", "jrd+json"] do + when format in ["jrd", "json", "jrd+json"] do with {:ok, response} <- WebFinger.webfinger(resource, "JSON") do json(conn, response) else |