moon
/
spc-pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

WebFinger: Add back in subscribe_address. 

It's used for remote following.
This commit is contained in:
lain 2020-05-05 09:36:38 +02:00
parent 8bed6ea922
commit f897da2115
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/pleroma/web/web_finger/web_finger.ex
View File

@ -88,6 +88,11 @@ def represent_user(user, "XML") do
defp webfinger_from_xml(doc) do defp webfinger_from_xml(doc) do
with subject <- XML.string_from_xpath("//Subject", doc), with subject <- XML.string_from_xpath("//Subject", doc),
subscribe_address <-
XML.string_from_xpath(
~s{//Link[@rel="http://ostatus.org/schema/1.0/subscribe"]/@template},
doc
),
ap_id <- ap_id <-
XML.string_from_xpath( XML.string_from_xpath(
~s{//Link[@rel="self" and @type="application/activity+json"]/@href}, ~s{//Link[@rel="self" and @type="application/activity+json"]/@href},
@ -95,6 +100,7 @@ defp webfinger_from_xml(doc) do
) do ) do
data = %{ data = %{
"subject" => subject, "subject" => subject,
"subscribe_address" => subscribe_address,
"ap_id" => ap_id "ap_id" => ap_id
} }