Merge pull request #3946 from MrZYX/feature/1781-include-reshares-in-user-feed

Include reshares in the public user feed, closes #1781

Changelog.md

@@ -3,6 +3,7 @@
 ## Features
 
 * Deleting a post that was shared to Facebook now deletes it from Facebook too [#3980]( https://github.com/diaspora/diaspora/pull/3980)
+* Include reshares in a users public atom feed [#1781](https://github.com/diaspora/diaspora/issues/1781)
 
 ## Bug Fixes
 

app/controllers/users_controller.rb

@@ -103,7 +103,7 @@ class UsersController < ApplicationController
     if @user = User.find_by_username(params[:username])
       respond_to do |format|
         format.atom do
-          @posts = StatusMessage.where(:author_id => @user.person_id, :public => true).order('created_at DESC').limit(25)
+          @posts = Post.where(:author_id => @user.person_id, :public => true).order('created_at DESC').limit(25)
         end
 
         format.any { redirect_to person_path(@user.person) }

app/views/users/public.atom.builder

@@ -28,6 +28,7 @@ atom_feed({'xmlns:thr' => 'http://purl.org/syndication/thread/1.0',
 
 
   @posts.each do |post|
+    post = post.absolute_root if post.is_a? Reshare
     feed.entry post, :url => "#{@user.url}p/#{post.id}",
       :id => "#{@user.url}p/#{post.id}" do |entry|
 

spec/controllers/users_controller_spec.rb

@@ -54,6 +54,12 @@ describe UsersController do
       response.body.should include('a href')
     end
 
+    it 'includes reshares in the atom feed' do
+      reshare = FactoryGirl.create(:reshare, :author => @user.person)
+      get :public, :username => @user.username, :format => :atom
+      response.body.should include reshare.root.raw_message
+    end
+
     it 'redirects to a profile page if html is requested' do
       get :public, :username => @user.username
       response.should be_redirect