GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Show Webfinger, URI and profile page as subject and aliases

Browse Source
This commit is contained in:
Evan Prodromou 2010-10-14 11:06:57 -04:00
parent 97a7fb246c
commit 23ac961624
1 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
plugins/OStatus/lib/xrdaction.php
View File

@ -37,6 +37,7 @@ class XrdAction extends Action
function handle() function handle()
{ {
$nick = $this->user->nickname; $nick = $this->user->nickname;
$profile = $this->user->getProfile();
if (empty($this->xrd)) { if (empty($this->xrd)) {
$xrd = new XRD(); $xrd = new XRD();
@ -47,10 +48,28 @@ class XrdAction extends Action
if (empty($xrd->subject)) { if (empty($xrd->subject)) {
$xrd->subject = Discovery::normalize($this->uri); $xrd->subject = Discovery::normalize($this->uri);
} }
$xrd->alias[] = $this->user->uri;
// Possible aliases for the user
$uris = array($this->user->uri, $profile->profileurl);
// FIXME: Webfinger generation code should live somewhere on its own
$path = common_config('site', 'path');
if (empty($path)) {
$uris[] = sprintf('acct:%s@%s', $nick, common_config('site', 'server'));
}
foreach ($uris as $uri) {
if ($uri != $xrd->subject) {
$xrd->alias[] = $uri;
}
}
$xrd->links[] = array('rel' => Discovery::PROFILEPAGE, $xrd->links[] = array('rel' => Discovery::PROFILEPAGE,
'type' => 'text/html', 'type' => 'text/html',
'href' => $this->user->uri); 'href' => $profile->profileurl);
$xrd->links[] = array('rel' => Discovery::UPDATESFROM, $xrd->links[] = array('rel' => Discovery::UPDATESFROM,
'href' => common_local_url('ApiTimelineUser', 'href' => common_local_url('ApiTimelineUser',
@ -66,7 +85,7 @@ class XrdAction extends Action
// XFN // XFN
$xrd->links[] = array('rel' => 'http://gmpg.org/xfn/11', $xrd->links[] = array('rel' => 'http://gmpg.org/xfn/11',
'type' => 'text/html', 'type' => 'text/html',
'href' => $this->user->uri); 'href' => $profile->profileurl);
// FOAF // FOAF
$xrd->links[] = array('rel' => 'describedby', $xrd->links[] = array('rel' => 'describedby',
'type' => 'application/rdf+xml', 'type' => 'application/rdf+xml',