Revert "Revert "Add remote follow path to webfinger.""
This reverts commit fb5aa34092
.
This commit is contained in:
parent
b259b4e4d1
commit
57d413e655
@ -22,6 +22,10 @@ defmodule Pleroma.Web.OStatus do
|
|||||||
"#{user.ap_id}/salmon"
|
"#{user.ap_id}/salmon"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def remote_follow_path do
|
||||||
|
"#{Web.base_url}/ostatus_subscribe?acct={uri}"
|
||||||
|
end
|
||||||
|
|
||||||
def handle_incoming(xml_string) do
|
def handle_incoming(xml_string) do
|
||||||
with doc when doc != :error <- parse_document(xml_string) do
|
with doc when doc != :error <- parse_document(xml_string) do
|
||||||
entries = :xmerl_xpath.string('//entry', doc)
|
entries = :xmerl_xpath.string('//entry', doc)
|
||||||
|
@ -44,7 +44,8 @@ defmodule Pleroma.Web.WebFinger do
|
|||||||
{:Link, %{rel: "http://schemas.google.com/g/2010#updates-from", type: "application/atom+xml", href: OStatus.feed_path(user)}},
|
{:Link, %{rel: "http://schemas.google.com/g/2010#updates-from", type: "application/atom+xml", href: OStatus.feed_path(user)}},
|
||||||
{:Link, %{rel: "http://webfinger.net/rel/profile-page", type: "text/html", href: user.ap_id}},
|
{:Link, %{rel: "http://webfinger.net/rel/profile-page", type: "text/html", href: user.ap_id}},
|
||||||
{:Link, %{rel: "salmon", href: OStatus.salmon_path(user)}},
|
{:Link, %{rel: "salmon", href: OStatus.salmon_path(user)}},
|
||||||
{:Link, %{rel: "magic-public-key", href: "data:application/magic-public-key,#{magic_key}"}}
|
{:Link, %{rel: "magic-public-key", href: "data:application/magic-public-key,#{magic_key}"}},
|
||||||
|
{:Link, %{rel: "http://ostatus.org/schema/1.0/subscribe", template: OStatus.remote_follow_path()}}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|> XmlBuilder.to_doc
|
|> XmlBuilder.to_doc
|
||||||
|
Loading…
Reference in New Issue
Block a user