From 06238703c3ceb81ea9665e5ca3ab3d59534ce977 Mon Sep 17 00:00:00 2001
From: maxwell <maxwell@joindiaspora.com>
Date: Fri, 16 Jul 2010 15:54:26 -0700
Subject: [PATCH] IZ MS bookmarks now create activity streams

---
 app/controllers/blogs_controller.rb     |  6 ++++++
 app/controllers/bookmarks_controller.rb |  6 ++++++
 lib/common.rb                           | 15 +++++++++++++++
 3 files changed, 27 insertions(+)

diff --git a/app/controllers/blogs_controller.rb b/app/controllers/blogs_controller.rb
index 27a5c8690..5bc4a5355 100644
--- a/app/controllers/blogs_controller.rb
+++ b/app/controllers/blogs_controller.rb
@@ -3,6 +3,12 @@ class BlogsController < ApplicationController
 
   def index
     @blogs = Blog.paginate :page => params[:page], :order => 'created_at DESC'
+    
+    format.html 
+    format.atom {render :xml => Diaspora::XML::generate(:current_url => request.url, :objects => @bookmarks)}
+ 
+  
+
   end
   
   def show
diff --git a/app/controllers/bookmarks_controller.rb b/app/controllers/bookmarks_controller.rb
index 2f62d5cd3..1c7b8d986 100644
--- a/app/controllers/bookmarks_controller.rb
+++ b/app/controllers/bookmarks_controller.rb
@@ -4,6 +4,12 @@ class BookmarksController < ApplicationController
   def index
     @bookmark = Bookmark.new
     @bookmarks = Bookmark.paginate :page => params[:page], :order => 'created_at DESC'
+    
+
+    respond_to do |format|
+      format.html 
+      format.atom {render :xml => Diaspora::XML::generate(:current_url => request.url, :objects => @bookmarks)}
+    end
   end
   
   def edit
diff --git a/lib/common.rb b/lib/common.rb
index 27db0866b..e494e7e88 100644
--- a/lib/common.rb
+++ b/lib/common.rb
@@ -164,6 +164,7 @@ module Diaspora
       def self.StatusMessage_build_entry(status_message)
         <<-XML
 <entry>
+<activity:verb>http://activitystrea.ms/schema/1.0/post</activity:verb>
 <title>#{status_message.message}</title>
 <link rel="alternate" type="text/html" href="#{OWNER.url}status_messages/#{status_message.id}"/>
 <id>#{OWNER.url}status_messages/#{status_message.id}</id>
@@ -173,6 +174,20 @@ module Diaspora
         XML
       end
 
+      def self.Bookmark_build_entry(bookmark)
+        <<-XML
+<entry>
+<activity:verb>http://activitystrea.ms/schema/1.0/post</activity:verb>
+<title>#{bookmark.title}</title>
+<link rel="alternate" type="text/html" href="#{OWNER.url}bookmarks/#{bookmark.id}"/>
+<link rel="related" type="text/html" href="#{bookmark.link}"
+<id>#{OWNER.url}bookmarks/#{bookmark.id}</id>
+<published>#{bookmark.created_at.xmlschema}</published>
+<updated>#{bookmark.updated_at.xmlschema}</updated>
+</entry>
+        XML
+      end
+
       def self.footer
         <<-XML.strip
 </feed>