0
@@ -13,6 +13,7 @@
0
 #
0
 
0
 class Connection < ActiveRecord::Base
0
+  extend ActivityLogger
0
   extend PreferencesHelper
0
   
0
   belongs_to :person
0
@@ -67,6 +68,7 @@ class Connection < ActiveRecord::Base
0
         accept_one_side(person, contact, accepted_at)
0
         accept_one_side(contact, person, accepted_at)
0
       end
0
+      log_activity(conn(person, contact))
0
     end
0
     
0
     def connect(person, contact, mail = global_prefs.email_notifications)
0
@@ -100,12 +102,18 @@ class Connection < ActiveRecord::Base
0
   
0
   private
0
   
0
-  # Update the db with one side of an accepted connection request.
0
-  def self.accept_one_side(person, contact, accepted_at)
0
-    # Sometimes person is just an ID, which fails for the Activity creation.
0
-    person = Person.find(person) unless person.is_a?(Person)
0
-    conn = conn(person, contact)
0
-    conn.update_attributes!(:status => ACCEPTED, :accepted_at => accepted_at)
0
-    Activity.create!(:item => conn, :person => person)
0
+  class << self
0
+    # Update the db with one side of an accepted connection request.
0
+    def accept_one_side(person, contact, accepted_at)
0
+      conn = conn(person, contact)
0
+      conn.update_attributes!(:status => ACCEPTED,
0
+                              :accepted_at => accepted_at)
0
+    end
0
+  
0
+    def log_activity(conn)
0
+      activity = Activity.create!(:item => conn, :person => conn.person)
0
+      add_activities(:activity => activity, :person => conn.person)
0
+      add_activities(:activity => activity, :person => conn.contact)
0
+    end
0
   end
0
 end

0
@@ -64,7 +64,7 @@ class Person < ActiveRecord::Base
0
   has_many :feeds
0
   has_many :activities, :through => :feeds, :order => 'created_at DESC',
0
                                             :limit => FEED_SIZE,
0
-                                            :group => 'activities.id'
0
+                                            :uniq => true
0
 
0
   validates_presence_of     :email, :name
0
   validates_presence_of     :password,              :if => :password_required?
0
@@ -117,7 +117,6 @@ class Person < ActiveRecord::Base
0
   # converts params[:id] into an int, and in Ruby
0
   # '1-michael-hartl'.to_i == 1
0
   def to_param
0
-    "#{id}-#{name.downcase.split.join('-')}"
0
     "#{id}-#{name.to_safe_uri}"
0
   end
0