Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots

app/models/person.rb

@@ -58,35 +58,6 @@ class Person
     encryption_key.public_key.export
   end
 
-
-
-
-  ######## Commenting  ########
-  def comment(text, options = {})
-    raise "must comment on something!" unless options[:on]
-    c = Comment.new(:person_id => self.id, :text => text, :post => options[:on])
-    c.creator_signature = c.sign_with_key(encryption_key)
-    if c.save
-      dispatch_comment c
-      
-      c.socket_to_uid owner.id if owner_id
-      c
-    else
-      Rails.logger.warn "this failed to save: #{c.inspect}"
-      false
-    end
-  end
-  
-  def dispatch_comment( c )
-    if owns? c.post
-      c.post_creator_signature = c.sign_with_key(encryption_key)
-      c.save
-      c.push_downstream
-    elsif owns? c
-      c.save
-      c.push_upstream
-    end
-  end
   ##profile
   def update_profile(params)
     if self.update_attributes(params)

app/models/user.rb

@@ -47,7 +47,7 @@ class User
     Group.create(opts)
   end
 
-   ######## Posting ########
+  ######## Posting ########
   def post(class_name, options = {})
     options[:person] = self.person
     model_class = class_name.to_s.camelize.constantize
@@ -69,6 +69,32 @@ class User
       self.posts.find_all_by_person_id( (group.person_ids + [self.person.id] ), :order => "created_at desc")
     end
   end
+
+  ######## Commenting  ########
+  def comment(text, options = {})
+    raise "must comment on something!" unless options[:on]
+    comment = Comment.new(:person_id => self.person.id, :text => text, :post => options[:on])
+    comment.creator_signature = comment.sign_with_key(encryption_key)
+    if comment.save
+      dispatch_comment comment
+      comment.socket_to_uid id
+      comment
+    else
+      Rails.logger.warn "this failed to save: #{comment.inspect}"
+      false
+    end
+  end
+  
+  def dispatch_comment( comment )
+    if owns? comment.post
+      comment.post_creator_signature = comment.sign_with_key(encryption_key)
+      comment.save
+      comment.push_downstream
+    elsif owns? comment
+      comment.save
+      comment.push_upstream
+    end
+  end
   
   ######### Posts and Such ###############