Merge branch 'patch-README' into 'develop'

[akkoma] / lib / pleroma / web / web_finger / web_finger.ex

diff --git a/lib/pleroma/web/web_finger/web_finger.ex b/lib/pleroma/web/web_finger/web_finger.ex
index 026d2f98bd908e455677070f8eac59f92513ccca..019210124584c0901359f91d46eaca6cf05e574b 100644 (file)
--- 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
@@ -58,7 +60,8 @@ defmodule Pleroma.Web.WebFinger do
     else
       {:ok, pem} = Salmon.generate_rsa_pem
       info = Map.put(info, "keys", pem)
-      Repo.update(Ecto.Changeset.change(user, info: info))
+      Ecto.Changeset.change(user, info: info)
+      |> User.update_and_set_cache()
     end
   end
 
@@ -68,11 +71,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
@@ -93,12 +100,13 @@ defmodule Pleroma.Web.WebFinger do
         with {:ok, %{body: body}} <- @httpoison.get("https://#{domain}/.well-known/host-meta", []) do
           get_template_from_xml(body)
         else
-          e -> {:error, "Can't find lrdd template: #{inspect(e)}"}
+          e -> {:error, "Can't find LRDD template: #{inspect(e)}"}
         end
     end
   end
 
   def finger(account) do
+    account = String.trim_leading(account, "@")
     domain = with [_name, domain] <- String.split(account, "@") do
                domain
              else _e ->
@@ -114,7 +122,7 @@ defmodule Pleroma.Web.WebFinger do
       {:ok, data}
     else
       e ->
-        Logger.debug(fn -> "Couldn't finger #{account}." end)
+        Logger.debug(fn -> "Couldn't finger #{account}" end)
         Logger.debug(fn -> inspect(e) end)
         {:error, e}
     end