Merge branch 'stable' into develop

Changelog.md

@@ -41,6 +41,7 @@ Ruby 2.0 is no longer officially supported.
 * ContactPresenter#full_hash_with_person did not contain relationship information [#5936](https://github.com/diaspora/diaspora/pull/5936)
 * Fix inactive user removal not respecting configuration for daily limits [#5953](https://github.com/diaspora/diaspora/pull/5953)
 * Fix missing localization of inactive user removal warning emails [#5950](https://github.com/diaspora/diaspora/issues/5950)
+* Fix fetching for public post while Webfingering [#5958](https://github.com/diaspora/diaspora/pull/5958)
 
 ## Features
 * Hide post title of limited post in comment notification email [#5843](https://github.com/diaspora/diaspora/pull/5843)

lib/diaspora/fetcher/public.rb

@@ -75,7 +75,7 @@ module Diaspora; module Fetcher; class Public
 
       FEDERATION_LOGGER.info "fetching public posts for #{@person.diaspora_handle}"
 
-      resp = Faraday.get("#{@person.url}people/#{@person.guid}") do |req|
+      resp = Faraday.get("#{@person.url}people/#{@person.guid}/stream") do |req|
         req.headers['Accept'] = 'application/json'
         req.headers['User-Agent'] = 'diaspora-fetcher'
       end

spec/lib/diaspora/fetcher/public_spec.rb

@@ -17,7 +17,7 @@ describe Diaspora::Fetcher::Public do
                                 :url => "https://remote-testpod.net",
                                 :diaspora_handle => "testuser@remote-testpod.net"})
 
-    stub_request(:get, /remote-testpod.net\/people\/.*/)
+    stub_request(:get, /remote-testpod.net\/people\/.*\/stream/)
       .with(headers: {
             'Accept'=>'application/json',
             'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',