diff --git a/app/controllers/blogs_controller.rb b/app/controllers/blogs_controller.rb index 5bc4a5355e60421f841c568523680f3cb25f379b..4a548de06d4014027c60f7ba9b7bf5c57a27ed51 100644 --- a/app/controllers/blogs_controller.rb +++ b/app/controllers/blogs_controller.rb @@ -4,9 +4,10 @@ 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)} - + respond_to do |format| + format.html + format.atom {render :xml => Diaspora::XML::generate(:current_url => request.url, :objects => @blogs)} + end end diff --git a/lib/common.rb b/lib/common.rb index d4a9b8cd95b4285c9bb35e84403ed12211cd3e00..db626a9637b5c2228235afe6fb3b5911aaa93cab 100644 --- a/lib/common.rb +++ b/lib/common.rb @@ -188,6 +188,23 @@ module Diaspora XML end + + def self.Blog_build_entry(blog) + <<-XML +<entry> +<activity:verb>http://activitystrea.ms/schema/1.0/post</activity:verb> +<title>#{blog.title}</title> +<content>#{blog.body}</content> +<permalink> +<link rel="alternate" type="text/html" href="#{OWNER.url}blogs/#{blog.id}"/> +</permalink> +<id>#{OWNER.url}blogs/#{blog.id}</id> +<published>#{blog.created_at.xmlschema}</published> +<updated>#{blog.updated_at.xmlschema}</updated> +</entry> + XML + end + def self.footer <<-XML.strip </feed>