User.consider_pd is boolean, so no need for double negation.

[rails.git] / app / views / user / api_read.builder

diff --git a/app/views/user/api_read.builder b/app/views/user/api_read.builder
index d25ff9f64046b2b84cd22629ff2dffbcde36a9a6..2b304f53ca2e618efa45a2a887c9eb6c831c9339 100644 (file)
--- a/app/views/user/api_read.builder
+++ b/app/views/user/api_read.builder
@@ -6,11 +6,14 @@ xml.osm("version" => API_VERSION, "generator" => GENERATOR) do
     if @this_user.description
       xml.tag! "description", @this_user.description
     end
-    xml.tag! "contributor-terms",
-        :agreed => !!@this_user.terms_agreed,
-        :pd => !!@this_user.consider_pd
-    if @this_user.image.file?
-      xml.tag! "img", :href => "http://#{SERVER_URL}#{@this_user.image.url}"
+    if @user && @user == @this_user
+      xml.tag! "contributor-terms", :agreed => !!@this_user.terms_agreed,
+                                    :pd => @this_user.consider_pd
+    else
+      xml.tag! "contributor-terms", :agreed => !!@this_user.terms_agreed
+    end
+    if @this_user.image.file? or @this_user.image_use_gravatar
+      xml.tag! "img", :href => user_image_url(@this_user, :size => 256)
     end
     xml.tag! "roles" do
       @this_user.roles.each do |role|
@@ -32,12 +35,17 @@ xml.osm("version" => API_VERSION, "generator" => GENERATOR) do
         xml.tag! "home", :lat => @this_user.home_lat,
                          :lon => @this_user.home_lon,
                          :zoom => @this_user.home_zoom
-      end    
+      end
       if @this_user.languages
         xml.tag! "languages" do
           @this_user.languages.split(",") { |lang| xml.tag! "lang", lang }
         end
       end
+      xml.tag! "messages" do
+        xml.tag! "received", :count => @this_user.messages.size,
+                             :unread => @this_user.new_messages.size
+        xml.tag! "sent", :count => @this_user.sent_messages.size
+      end
     end
   end
 end