From 85b384010e2d00c601b30b1979ea098333effa16 Mon Sep 17 00:00:00 2001
From: kook <kook@social.crabdance.com>
Date: Thu, 30 Sep 2010 06:23:11 +0200
Subject: [PATCH] exchange photos on adding new friend

---
 app/models/person.rb        | 2 +-
 app/views/publics/hcard.erb | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/models/person.rb b/app/models/person.rb
index 28503e921..a6d295529 100644
--- a/app/models/person.rb
+++ b/app/models/person.rb
@@ -110,7 +110,7 @@ class Person
     hcard = HCard.find profile.hcard.first[:href]
 
     new_person.url = hcard[:url]
-    new_person.profile = Profile.new(:first_name => hcard[:given_name], :last_name => hcard[:family_name])
+    new_person.profile = Profile.new(:first_name => hcard[:given_name], :last_name => hcard[:family_name], :image_url => hcard[:photo])
     if new_person.save
       new_person
     else
diff --git a/app/views/publics/hcard.erb b/app/views/publics/hcard.erb
index 9e3f27796..aadddc4e1 100644
--- a/app/views/publics/hcard.erb
+++ b/app/views/publics/hcard.erb
@@ -33,9 +33,15 @@
         <a href="<%= @person.url%>" rel="me" id="pod_location" class="url"><%= @person.url%></a>
         </dd>
       </dl>
+      <dl class="entity_photo">
+        <dt>Photo</dt>
+        <dd>
+        <span class="photo"><%= @person.profile.image_url%></span>
+        </dd>
+      </dl>
       <dl class="entity_note">
         <dt>Note</dt>
-        <dd class="note">Diaspora is awesome! vi is better than emacs!</dd>
+        <dd class="note">Diaspora is awesome! Emacs is better than vi!</dd>
       </dl>
     </div>
   </div>