diff options
| author | lain <lain@soykaf.club> | 2020-12-21 17:13:52 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-12-21 17:13:52 +0000 |
| commit | 8e1f32e71560c4b36ccbdc3ecf8de8386928305a (patch) | |
| tree | 521e20b6508a00917c900ce89367f5764551fc17 | |
| parent | 19be32a74e758baf7eb8c738ba0f11de7cb7eb6e (diff) | |
| parent | fb02241580e095a7481c2e8e7ff0e5f6dc535c72 (diff) | |
Merge branch 'develop' into 'develop'
WebFinger: add subscribe_address in return data of JSON responses
See merge request pleroma/pleroma!3206
| -rw-r--r-- | lib/pleroma/web/web_finger.ex | 3 | ||||
| -rw-r--r-- | test/pleroma/web/web_finger_test.exs | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lib/pleroma/web/web_finger.ex b/lib/pleroma/web/web_finger.ex index 6629f5356..2e39ae048 100644 --- a/lib/pleroma/web/web_finger.ex +++ b/lib/pleroma/web/web_finger.ex @@ -116,6 +116,9 @@ defmodule Pleroma.Web.WebFinger do {"application/ld+json; profile=\"https://www.w3.org/ns/activitystreams\"", "self"} -> Map.put(data, "ap_id", link["href"]) + {nil, "http://ostatus.org/schema/1.0/subscribe"} -> + Map.put(data, "subscribe_address", link["template"]) + _ -> Logger.debug("Unhandled type: #{inspect(link["type"])}") data diff --git a/test/pleroma/web/web_finger_test.exs b/test/pleroma/web/web_finger_test.exs index 96fc0bbaa..19f33a975 100644 --- a/test/pleroma/web/web_finger_test.exs +++ b/test/pleroma/web/web_finger_test.exs @@ -56,12 +56,13 @@ defmodule Pleroma.Web.WebFingerTest do {:ok, _data} = WebFinger.finger(user) end - test "returns the ActivityPub actor URI for an ActivityPub user with the ld+json mimetype" do + test "returns the ActivityPub actor URI and subscribe address for an ActivityPub user with the ld+json mimetype" do user = "kaniini@gerzilla.de" {:ok, data} = WebFinger.finger(user) assert data["ap_id"] == "https://gerzilla.de/channel/kaniini" + assert data["subscribe_address"] == "https://gerzilla.de/follow?f=&url={uri}" end test "it work for AP-only user" do |