Merge branch 'master' of github.com:diaspora/diaspora

app/models/status_message.rb

@@ -13,12 +13,13 @@ class StatusMessage < Post
   def to_activity
         <<-XML
   <entry>
-    <activity:verb>http://activitystrea.ms/schema/1.0/post</activity:verb>
     <title>#{self.message}</title>
     <link rel="alternate" type="text/html" href="#{person.url}status_messages/#{self.id}"/>
     <id>#{person.url}status_messages/#{self.id}</id>
     <published>#{self.created_at.xmlschema}</published>
     <updated>#{self.updated_at.xmlschema}</updated>
+    <activity:verb>http://activitystrea.ms/schema/1.0/post</activity:verb>
+    <activity:object-type>http://activitystrea.ms/schema/1.0/note</activity:object-type>
   </entry>
         XML
   end

lib/diaspora/ostatus_builder.rb

@@ -42,6 +42,7 @@ module Diaspora
     def create_endpoints
       <<-XML
 <link href="#{APP_CONFIG[:pubsub_server]}" rel="hub"/>
+<link href="#{@user.public_url}.atom" rel="self" type="application/atom+xml"/>
       XML
     end