From 9f8e018422932ed32dcd936341b60271fb43da25 Mon Sep 17 00:00:00 2001
From: Benjamin Neff <benjamin@coding4coffee.ch>
Date: Mon, 28 Dec 2015 01:51:41 +0100
Subject: [PATCH] add subscribe url to webfinger

---
 config/initializers/diaspora_federation.rb | 19 ++++++++++---------
 spec/federation_callbacks_spec.rb          |  1 +
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/config/initializers/diaspora_federation.rb b/config/initializers/diaspora_federation.rb
index 58285b292..4d63aebd2 100644
--- a/config/initializers/diaspora_federation.rb
+++ b/config/initializers/diaspora_federation.rb
@@ -10,15 +10,16 @@ DiasporaFederation.configure do |config|
       person = Person.find_local_by_diaspora_handle(handle)
       if person
         DiasporaFederation::Discovery::WebFinger.new(
-          acct_uri:    "acct:#{person.diaspora_handle}",
-          alias_url:   AppConfig.url_to("/people/#{person.guid}"),
-          hcard_url:   AppConfig.url_to(DiasporaFederation::Engine.routes.url_helpers.hcard_path(person.guid)),
-          seed_url:    AppConfig.pod_uri,
-          profile_url: person.profile_url,
-          atom_url:    person.atom_url,
-          salmon_url:  person.receive_url,
-          guid:        person.guid,
-          public_key:  person.serialized_public_key
+          acct_uri:      "acct:#{person.diaspora_handle}",
+          alias_url:     AppConfig.url_to("/people/#{person.guid}"),
+          hcard_url:     AppConfig.url_to(DiasporaFederation::Engine.routes.url_helpers.hcard_path(person.guid)),
+          seed_url:      AppConfig.pod_uri,
+          profile_url:   person.profile_url,
+          atom_url:      person.atom_url,
+          salmon_url:    person.receive_url,
+          subscribe_url: AppConfig.url_to("/people?q={uri}"),
+          guid:          person.guid,
+          public_key:    person.serialized_public_key
         )
       end
     end
diff --git a/spec/federation_callbacks_spec.rb b/spec/federation_callbacks_spec.rb
index 80d2ba6de..a775d5ecc 100644
--- a/spec/federation_callbacks_spec.rb
+++ b/spec/federation_callbacks_spec.rb
@@ -13,6 +13,7 @@ describe "diaspora federation callbacks" do
       expect(wf.profile_url).to eq(person.profile_url)
       expect(wf.atom_url).to eq(person.atom_url)
       expect(wf.salmon_url).to eq(person.receive_url)
+      expect(wf.subscribe_url).to eq(AppConfig.url_to("/people?q={uri}"))
       expect(wf.guid).to eq(person.guid)
       expect(wf.public_key).to eq(person.serialized_public_key)
     end