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

OStatus update-profile.php script now finds Diaspora salmon URLs

Browse Source
This commit is contained in:
Mikael Nordfeldth 2015-06-06 16:18:22 +02:00
parent 4de125dd84
commit b63054cb1d
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
plugins/OStatus/scripts/update-profile.php
View File

@ -54,10 +54,28 @@ print "\n";
print "Re-running feed discovery for profile URL $oprofile->uri\n"; print "Re-running feed discovery for profile URL $oprofile->uri\n";
// @fixme will bork where the URI isn't the profile URL for now // @fixme will bork where the URI isn't the profile URL for now
$discover = new FeedDiscovery(); $discover = new FeedDiscovery();
$feedurl = $discover->discoverFromURL($oprofile->uri); try {
$feedurl = $discover->discoverFromURL($oprofile->uri);
$salmonuri = $discover->getAtomLink(Salmon::REL_SALMON)
?: $discover->getAtomLink(Salmon::NS_REPLIES); // NS_REPLIES is deprecated
} catch (FeedSubException $e) {
$acct = $oprofile->localProfile()->getAcctUri();
print "Could not discover feeds HTML response, trying reconstructed acct URI: " . $acct;
$disco = new Discovery();
$xrd = $disco->lookup($acct);
$hints = DiscoveryHints::fromXRD($xrd);
if (!array_key_exists('feedurl', $hints)) {
throw new FeedSubNoFeedException($acct);
}
$feedurl = $hints['feedurl'];
$salmonuri = array_key_exists('salmon', $hints) ? $hints['salmon'] : null;
// get the hub data too and put it in the FeedDiscovery object
$discover->discoverFromFeedUrl($feedurl);
}
$huburi = $discover->getHubLink(); $huburi = $discover->getHubLink();
$salmonuri = $discover->getAtomLink(Salmon::REL_SALMON)
?: $discover->getAtomLink(Salmon::NS_REPLIES);
print " Feed URL: $feedurl\n"; print " Feed URL: $feedurl\n";
print " Hub URL: $huburi\n"; print " Hub URL: $huburi\n";