wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'direct-feed-sub' into 'master'

Browse Source 
If we are given a direct URL to a feed, use that



See merge request !54
This commit is contained in:
mmn 2015-12-14 21:09:56 +00:00
commit 0baa9debbc
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/OStatus/actions/ostatussub.php
View File

@ -281,6 +281,10 @@ class OStatusSubAction extends Action
// TRANS: Error text. // TRANS: Error text.
$this->error = _m("Sorry, we could not reach that feed. Please try that OStatus address again later."); $this->error = _m("Sorry, we could not reach that feed. Please try that OStatus address again later.");
common_debug('Not a recognized feed type.', __FILE__); common_debug('Not a recognized feed type.', __FILE__);
} catch (FeedSubNoHubException $e) {
// TRANS: Error text.
$this->error = _m("Sorry, that feed is not Pubsubhubub enabled.");
common_debug('No hub found.', __FILE__);
} catch (Exception $e) { } catch (Exception $e) {
// Any new ones we forgot about // Any new ones we forgot about
// TRANS: Error message in OStatus plugin. Do not translate the domain names example.com // TRANS: Error message in OStatus plugin. Do not translate the domain names example.com

7
plugins/OStatus/classes/Ostatus_profile.php
View File

@ -635,6 +635,12 @@ class Ostatus_profile extends Managed_DataObject
} }
} }
if (in_array(
preg_replace('/\s*;.*$/', '', $response->getHeader('Content-Type')),
array('application/rss+xml', 'application/atom+xml', 'application/xml', 'text/xml'))
) {
$hints['feedurl'] = $response->getUrl();
} else {
// Try to get some hCard data // Try to get some hCard data
$body = $response->getBody(); $body = $response->getBody();
@ -644,6 +650,7 @@ class Ostatus_profile extends Managed_DataObject
if (!empty($hcardHints)) { if (!empty($hcardHints)) {
$hints = array_merge($hints, $hcardHints); $hints = array_merge($hints, $hcardHints);
} }
}
// Check if they've got an LRDD header // Check if they've got an LRDD header