nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Raphael 2010-10-05 17:06:17 -07:00
commit 233a2d2bb2
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/models/status_message.rb
View file

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

1
lib/diaspora/ostatus_builder.rb
View file

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