From bbb0a7d5bc2c8815a2057eb0a6588d8d60ff4416 Mon Sep 17 00:00:00 2001 From: James Walker Date: Fri, 26 Feb 2010 13:17:24 -0500 Subject: updating to use latest salmon NS definitions --- plugins/OStatus/actions/xrd.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'plugins/OStatus/actions') diff --git a/plugins/OStatus/actions/xrd.php b/plugins/OStatus/actions/xrd.php index e6b694d61..4350ad025 100644 --- a/plugins/OStatus/actions/xrd.php +++ b/plugins/OStatus/actions/xrd.php @@ -80,10 +80,14 @@ class XrdAction extends Action 'href' => common_local_url('foaf', array('nickname' => $nick))); - $salmon_url = common_local_url('salmon', + // Salmon + $salmon_url = common_local_url('usersalmon', array('id' => $this->user->id)); - $xrd->links[] = array('rel' => 'salmon', + $xrd->links[] = array('rel' => Salmon::NS_REPLIES, + 'href' => $salmon_url); + + $xrd->links[] = array('rel' => Salmon::NS_MENTIONS, 'href' => $salmon_url); // Get this user's keypair -- cgit v1.2.3-54-g00ecf From 3a7eef1074a80150fd428c73d49bcd4fc1b66e89 Mon Sep 17 00:00:00 2001 From: James Walker Date: Fri, 26 Feb 2010 13:40:33 -0500 Subject: only put public keys in XRD --- plugins/OStatus/actions/xrd.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'plugins/OStatus/actions') diff --git a/plugins/OStatus/actions/xrd.php b/plugins/OStatus/actions/xrd.php index 4350ad025..f574b60ee 100644 --- a/plugins/OStatus/actions/xrd.php +++ b/plugins/OStatus/actions/xrd.php @@ -99,7 +99,7 @@ class XrdAction extends Action } $xrd->links[] = array('rel' => Magicsig::PUBLICKEYREL, - 'href' => 'data:application/magic-public-key;'. $magickey->keypair); + 'href' => 'data:application/magic-public-key;'. $magickey->toString(false)); // TODO - finalize where the redirect should go on the publisher $url = common_local_url('ostatussub') . '?profile={uri}'; -- cgit v1.2.3-54-g00ecf