diff options
| author | Zach Copley <zach@status.net> | 2010-02-22 01:23:24 -0800 |
|---|---|---|
| committer | Zach Copley <zach@status.net> | 2010-02-22 01:23:24 -0800 |
| commit | 35be39e30eacda1b0425a2ae9f8e58cd0867d157 (patch) | |
| tree | df86f17a666e5d0bb775dbcef0fc4eb5b1c777f3 /plugins/OStatus/actions/webfinger.php | |
| parent | 47300a2ae9a51108fbf59a57cf5ab6e8867b54a6 (diff) | |
| parent | 17ed30dffc1c05259baf2f0387089547e39684d7 (diff) | |
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'plugins/OStatus/actions/webfinger.php')
| -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', |