diff options
| author | Brion Vibber <brion@pobox.com> | 2010-02-21 18:54:06 -0800 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-02-21 18:54:06 -0800 |
| commit | d3996996e483bc8ee1b4c9a38bc3ad17baabb8c0 (patch) | |
| tree | 90cbe4986bc5624575fdce011623f0c85c0f1275 /plugins/OStatus/actions | |
| parent | 78ca45c7a05dea911c58097a8c57be470dafee01 (diff) | |
| parent | 273c0e036347891570a02502715345f5bbb7b143 (diff) | |
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'plugins/OStatus/actions')
| -rw-r--r-- | plugins/OStatus/actions/webfinger.php | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/plugins/OStatus/actions/webfinger.php b/plugins/OStatus/actions/webfinger.php index f4dc61b7d..cf60b8069 100644 --- a/plugins/OStatus/actions/webfinger.php +++ b/plugins/OStatus/actions/webfinger.php @@ -37,7 +37,7 @@ class WebfingerAction extends Action return true; } - + function handle() { $acct = Webfinger::normalize($this->uri); @@ -55,16 +55,22 @@ class WebfingerAction extends Action $xrd->subject = $this->uri; $xrd->alias[] = common_profile_url($nick); - $xrd->links[] = array('rel' => 'http://webfinger.net/rel/profile-page', + $xrd->links[] = array('rel' => Webfinger::PROFILEPAGE, 'type' => 'text/html', 'href' => common_profile_url($nick)); + $xrd->links[] = array('rel' => Webfinger::UPDATESFROM, + 'href' => common_local_url('ApiTimelineUser', + array('id' => $this->user->id, + 'format' => 'atom')), + 'type' => 'application/atom+xml'); + $salmon_url = common_local_url('salmon', array('id' => $this->user->id)); $xrd->links[] = array('rel' => 'salmon', 'href' => $salmon_url); - + // TODO - finalize where the redirect should go on the publisher $url = common_local_url('ostatussub') . '?profile={uri}'; $xrd->links[] = array('rel' => 'http://ostatus.org/schema/1.0/subscribe', |