diff options
| author | Roger Braun <roger@rogerbraun.net> | 2017-05-05 11:46:59 +0200 |
|---|---|---|
| committer | Roger Braun <roger@rogerbraun.net> | 2017-05-05 11:46:59 +0200 |
| commit | c48c381e909240dcece9f961e4728fa712d089cc (patch) | |
| tree | 6aa2a1edbfe5d15860ab5090c645bc9ba312ab96 /lib/pleroma/web/ostatus/feed_representer.ex | |
| parent | 6cf7c132282e612514af992c6dea0b03ee5b678d (diff) | |
| parent | c85998ab8a21f042ab57345a7baa9e1e27c308d1 (diff) | |
| download | pleroma-c48c381e909240dcece9f961e4728fa712d089cc.tar.gz | |
Merge branch 'develop' into dtluna/pleroma-refactor/1
Diffstat (limited to 'lib/pleroma/web/ostatus/feed_representer.ex')
| -rw-r--r-- | lib/pleroma/web/ostatus/feed_representer.ex | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/pleroma/web/ostatus/feed_representer.ex b/lib/pleroma/web/ostatus/feed_representer.ex index 86c6f9d4f..6b67b8ddf 100644 --- a/lib/pleroma/web/ostatus/feed_representer.ex +++ b/lib/pleroma/web/ostatus/feed_representer.ex @@ -17,14 +17,17 @@ defmodule Pleroma.Web.OStatus.FeedRepresenter do [{ :feed, [ xmlns: 'http://www.w3.org/2005/Atom', + "xmlns:thr": 'http://purl.org/syndication/thread/1.0', "xmlns:activity": 'http://activitystrea.ms/spec/1.0/', - "xmlns:poco": 'http://portablecontacts.net/spec/1.0' + "xmlns:poco": 'http://portablecontacts.net/spec/1.0', + "xmlns:ostatus": 'http://ostatus.org/schema/1.0' ], [ {:id, h.(OStatus.feed_path(user))}, {:title, ['#{user.nickname}\'s timeline']}, {:updated, h.(most_recent_update)}, {:link, [rel: 'hub', href: h.(OStatus.pubsub_path(user))], []}, - {:link, [rel: 'self', href: h.(OStatus.feed_path(user))], []}, + {:link, [rel: 'salmon', href: h.(OStatus.salmon_path(user))], []}, + {:link, [rel: 'self', href: h.(OStatus.feed_path(user)), type: 'application/atom+xml'], []}, {:author, UserRepresenter.to_simple_form(user)}, ] ++ entries }] |