aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authoreal <eal@waifu.club>2018-01-18 03:42:09 +0200
committereal <eal@waifu.club>2018-01-18 03:42:09 +0200
commitfb5aa34092cf8aa04b3b7001e81cf1585ee0041a (patch)
treeb2ce450fca33140d458d35d966b97abe9adff13b /lib
parent47e8c8db05dbe1f9d0ad7790be9ae9ed40f4e909 (diff)
downloadpleroma-fb5aa34092cf8aa04b3b7001e81cf1585ee0041a.tar.gz
Revert "Add remote follow path to webfinger."
This reverts commit bc689740f09ee8201982455988bf5f4ccb02fe57.
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/ostatus/ostatus.ex4
-rw-r--r--lib/pleroma/web/web_finger/web_finger.ex3
2 files changed, 1 insertions, 6 deletions
diff --git a/lib/pleroma/web/ostatus/ostatus.ex b/lib/pleroma/web/ostatus/ostatus.ex
index e65cab3ed..745539b3e 100644
--- a/lib/pleroma/web/ostatus/ostatus.ex
+++ b/lib/pleroma/web/ostatus/ostatus.ex
@@ -22,10 +22,6 @@ defmodule Pleroma.Web.OStatus do
"#{user.ap_id}/salmon"
end
- def remote_follow_path do
- "#{Web.base_url}/ostatus_subscribe?acct={uri}"
- end
-
def handle_incoming(xml_string) do
with doc when doc != :error <- parse_document(xml_string) do
entries = :xmerl_xpath.string('//entry', doc)
diff --git a/lib/pleroma/web/web_finger/web_finger.ex b/lib/pleroma/web/web_finger/web_finger.ex
index 4ae3eab59..026d2f98b 100644
--- a/lib/pleroma/web/web_finger/web_finger.ex
+++ b/lib/pleroma/web/web_finger/web_finger.ex
@@ -44,8 +44,7 @@ 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://webfinger.net/rel/profile-page", type: "text/html", href: user.ap_id}},
{:Link, %{rel: "salmon", href: OStatus.salmon_path(user)}},
- {: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()}}
+ {:Link, %{rel: "magic-public-key", href: "data:application/magic-public-key,#{magic_key}"}}
]
}
|> XmlBuilder.to_doc