From 8178e0712cf6ce2045e7d3e93c5c4a2f4cd15ef1 Mon Sep 17 00:00:00 2001
From: JMSilla <josilma1@gmail.com>
Date: Sat, 25 Feb 2012 22:24:43 +0000
Subject: [PATCH] Users controller small fix; removed the to_activity method
 and the corresponding tests for status_message model

---
 app/controllers/users_controller.rb |  2 +-
 app/models/status_message.rb        | 16 ----------------
 spec/models/status_message_spec.rb  |  7 -------
 3 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index d7dce5d80..0cac47935 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -105,7 +105,7 @@ class UsersController < ApplicationController
           @posts = StatusMessage.where(:author_id => @user.person.id, :public => true).order('created_at DESC').limit(25)
         end
 
-        format.any { redirect_to person_path(user.person) }
+        format.any { redirect_to person_path(@user.person) }
       end
     else
       redirect_to stream_path, :error => I18n.t('users.public.does_not_exist', :username => params[:username])
diff --git a/app/models/status_message.rb b/app/models/status_message.rb
index d61f45eb9..c71856ec4 100644
--- a/app/models/status_message.rb
+++ b/app/models/status_message.rb
@@ -125,22 +125,6 @@ class StatusMessage < Post
     identifiers.empty? ? [] : Person.where(:diaspora_handle => identifiers)
   end
 
-  def to_activity(opts={})
-    author = opts[:author] || self.author #Use an already loaded author if passed in.
-    <<-XML
-  <entry>
-    <title>#{x(self.formatted_message(:plain_text => true))}</title>
-    <content>#{x(self.formatted_message(:plain_text => true))}</content>
-    <link rel="alternate" type="text/html" href="#{author.url}p/#{self.id}"/>
-    <id>#{author.url}p/#{self.id}</id>
-    <published>#{self.created_at.xmlschema}</published>
-    <updated>#{self.updated_at.xmlschema}</updated>
-    <activity:verb>http://activitystrea.ms/schema/1.0/post</activity:verb>
-    <activity:object-type>http://activitystrea.ms/schema/1.0/note</activity:object-type>
-  </entry>
-    XML
-  end
-
   def after_dispatch(sender)
     self.update_and_dispatch_attached_photos(sender)
   end
diff --git a/spec/models/status_message_spec.rb b/spec/models/status_message_spec.rb
index 38189d12f..e9ab1b5e6 100644
--- a/spec/models/status_message_spec.rb
+++ b/spec/models/status_message_spec.rb
@@ -287,13 +287,6 @@ STR
         @marshalled.diaspora_handle.should == @message.diaspora_handle
       end
     end
-
-
-    describe '#to_activity' do
-      it 'should render a string' do
-        @message.to_activity.should_not be_blank
-      end
-    end
   end
 
   describe '#after_dispatch' do