Merge pull request #2811 from gandaro/2809-atom-userlink-incorrect

use guid in atom feed to fix the link

lib/diaspora/ostatus_builder.rb

@@ -20,6 +20,7 @@ module Diaspora
 
   class OstatusBuilder
     include Diaspora::Webhooks
+    include PeopleHelper
 
     def initialize(user, posts)
       @user = user
@@ -44,7 +45,7 @@ module Diaspora
 <author>
   <activity:object-type>http://activitystrea.ms/schema/1.0/person</activity:object-type>
   <name>#{x(@user.name)}</name>
-  <uri>#{AppConfig[:pod_url]}people/#{@user.person.id}</uri>
+  <uri>#{AppConfig[:pod_url]}#{local_or_remote_person_path(@user.person)[1..-1]}</uri>
   <poco:preferredUsername>#{x(@user.username)}</poco:preferredUsername>
   <poco:displayName>#{x(@user.person.name)}</poco:displayName>
 </author>