aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-12-21 17:13:52 +0000
committerlain <lain@soykaf.club>2020-12-21 17:13:52 +0000
commit8e1f32e71560c4b36ccbdc3ecf8de8386928305a (patch)
tree521e20b6508a00917c900ce89367f5764551fc17 /lib
parent19be32a74e758baf7eb8c738ba0f11de7cb7eb6e (diff)
parentfb02241580e095a7481c2e8e7ff0e5f6dc535c72 (diff)
downloadpleroma-8e1f32e71560c4b36ccbdc3ecf8de8386928305a.tar.gz
Merge branch 'develop' into 'develop'
WebFinger: add subscribe_address in return data of JSON responses See merge request pleroma/pleroma!3206
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/web_finger.ex3
1 files changed, 3 insertions, 0 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