X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Fweb_finger%2Fweb_finger.ex;h=bbd65da61627af8e739b0292b5b9fba624c670fa;hb=1331a39d3997cd93ae08b778a793ea0f2a3b8523;hp=026d2f98bd908e455677070f8eac59f92513ccca;hpb=fb5aa34092cf8aa04b3b7001e81cf1585ee0041a;p=akkoma

diff --git a/lib/pleroma/web/web_finger/web_finger.ex b/lib/pleroma/web/web_finger/web_finger.ex
index 026d2f98b..bbd65da61 100644
--- a/lib/pleroma/web/web_finger/web_finger.ex
+++ b/lib/pleroma/web/web_finger/web_finger.ex
@@ -44,7 +44,9 @@ 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: "magic-public-key", href: "data:application/magic-public-key,#{magic_key}"}},
+        {:Link, %{rel: "self", type: "application/activity+json", href: user.ap_id}},
+        {:Link, %{rel: "http://ostatus.org/schema/1.0/subscribe", template: OStatus.remote_follow_path()}}
       ]
     }
     |> XmlBuilder.to_doc
@@ -68,11 +70,15 @@ defmodule Pleroma.Web.WebFinger do
     topic = XML.string_from_xpath(~s{//Link[@rel="http://schemas.google.com/g/2010#updates-from"]/@href}, doc)
     subject = XML.string_from_xpath("//Subject", doc)
     salmon = XML.string_from_xpath(~s{//Link[@rel="salmon"]/@href}, doc)
+    subscribe_address = XML.string_from_xpath(~s{//Link[@rel="http://ostatus.org/schema/1.0/subscribe"]/@template}, doc)
+    ap_id = XML.string_from_xpath(~s{//Link[@rel="self" and @type="application/activity+json"]/@href}, doc)
     data = %{
       "magic_key" => magic_key,
       "topic" => topic,
       "subject" => subject,
-      "salmon" => salmon
+      "salmon" => salmon,
+      "subscribe_address" => subscribe_address,
+      "ap_id" => ap_id
     }
     {:ok, data}
   end
@@ -99,6 +105,7 @@ defmodule Pleroma.Web.WebFinger do
   end
 
   def finger(account) do
+    account = String.trim_leading(account, "@")
     domain = with [_name, domain] <- String.split(account, "@") do
                domain
              else _e ->