following random feeds

This commit is contained in:
Friendika 2011-01-23 20:09:34 -08:00
parent 00d2b58358
commit 5be98e3ec8
3 changed files with 91 additions and 3 deletions

View file

@ -22,6 +22,8 @@ function scrape_dfrn($url) {
foreach($items as $item) { foreach($items as $item) {
$x = $item->getAttribute('rel'); $x = $item->getAttribute('rel');
if(($x === 'alternate') && ($item->getAttribute('type') === 'application/atom+xml'))
$ret['feed_atom'] = $item->getAttribute('href');
if(substr($x,0,5) == "dfrn-") if(substr($x,0,5) == "dfrn-")
$ret[$x] = $item->getAttribute('href'); $ret[$x] = $item->getAttribute('href');
if($x === 'lrdd') { if($x === 'lrdd') {
@ -135,3 +137,31 @@ function scrape_vcard($url) {
return $ret; return $ret;
}} }}
if(! function_exists('scrape_feed')) {
function scrape_feed($url) {
$ret = array();
$s = fetch_url($url);
if(! $s)
return $ret;
$dom = HTML5_Parser::parse($s);
if(! $dom)
return $ret;
$items = $dom->getElementsByTagName('link');
// get Atom link elements
foreach($items as $item) {
$x = $item->getAttribute('rel');
if(($x === 'alternate') && ($item->getAttribute('type') === 'application/atom+xml'))
$ret['feed_atom'] = $item->getAttribute('href');
}
return $ret;
}}

View file

@ -32,10 +32,18 @@
if(($argc > 1) && ($argv[1] == 'force')) if(($argc > 1) && ($argv[1] == 'force'))
$force = true; $force = true;
if(($argc > 1) && intval($argv[1])) {
$manual_id = intval($argv[1]);
$force = true;
}
$sql_extra = (($manual_id) ? " AND `id` = $manual_id " : "");
// 'stat' clause is a temporary measure until we have federation subscriptions working both directions // 'stat' clause is a temporary measure until we have federation subscriptions working both directions
$contacts = q("SELECT * FROM `contact` $contacts = q("SELECT * FROM `contact`
WHERE ( ( `network` = 'dfrn' AND ( `dfrn-id` != '' OR (`issued-id` != '' AND `duplex` = 1))) WHERE ( ( `network` = 'dfrn' AND ( `dfrn-id` != '' OR (`issued-id` != '' AND `duplex` = 1)))
OR ( `network` IN ( 'stat', 'feed' ) AND `poll` != '' )) OR ( `network` IN ( 'stat', 'feed' ) AND `poll` != '' ))
$sql_extra
AND `self` = 0 AND `blocked` = 0 AND `readonly` = 0 ORDER BY RAND()"); AND `self` = 0 AND `blocked` = 0 AND `readonly` = 0 ORDER BY RAND()");
if(! count($contacts)) if(! count($contacts))

View file

@ -48,6 +48,8 @@ function follow_post(&$a) {
} }
} }
$network = 'stat';
if($hcard) { if($hcard) {
$vcard = scrape_vcard($hcard); $vcard = scrape_vcard($hcard);
@ -63,13 +65,58 @@ function follow_post(&$a) {
if(! $profile) if(! $profile)
$profile = $url; $profile = $url;
// do we have enough information?
if(! x($vcard,'fn')) if(! x($vcard,'fn'))
if(x($vcard,'nick')) if(x($vcard,'nick'))
$vcard['fn'] = $vcard['nick']; $vcard['fn'] = $vcard['nick'];
if((! isset($vcard)) && (! $poll)) {
$ret = scrape_feed($url);
if(count($ret) && $ret['feed_atom']) {
$poll = $ret['feed_atom'];
$vcard = array();
require_once('simplepie/simplepie.inc');
$feed = new SimplePie();
$xml = fetch_url($poll);
$feed->set_raw_data($xml);
$feed->init();
$vcard['photo'] = $feed->get_image_url();
$author = $feed->get_author();
if($author) {
$vcard['fn'] = trim($author->get_name());
$vcard['nick'] = strtolower($vcard['fn']);
if(strpos($vcard['nick'],' '))
$vcard['nick'] = trim(substr($vcard['nick'],0,strpos($vcard['nick'],' ')));
$email = $author->get_email();
}
else {
$item = $feed->get_item(0);
if($item) {
$author = $item->get_author();
if($author) {
$vcard['fn'] = trim($author->get_name());
$vcard['nick'] = strtolower($vcard['fn']);
if(strpos($vcard['nick'],' '))
$vcard['nick'] = trim(substr($vcard['nick'],0,strpos($vcard['nick'],' ')));
$email = $author->get_email();
}
}
}
if((! $vcard['photo']) && strlen($email))
$vcard['photo'] = gravatar_img($email);
$network = 'feed';
}
}
logger('follow: poll=' . $poll . ' notify=' . $notify . ' profile=' . $profile . ' vcard=' . print_r($vcard,true)); logger('follow: poll=' . $poll . ' notify=' . $notify . ' profile=' . $profile . ' vcard=' . print_r($vcard,true));
// do we have enough information?
if(! ((x($vcard['fn'])) && ($poll) && ($profile))) { if(! ((x($vcard['fn'])) && ($poll) && ($profile))) {
notice( t('The profile address specified does not provide adequate information.') . EOL); notice( t('The profile address specified does not provide adequate information.') . EOL);
@ -115,7 +162,7 @@ function follow_post(&$a) {
dbesc($vcard['fn']), dbesc($vcard['fn']),
dbesc($vcard['nick']), dbesc($vcard['nick']),
dbesc($vcard['photo']), dbesc($vcard['photo']),
dbesc('stat'), dbesc($network),
intval(REL_FAN) intval(REL_FAN)
); );
} }
@ -158,6 +205,9 @@ function follow_post(&$a) {
// pull feed and consume it, which should subscribe to the hub. // pull feed and consume it, which should subscribe to the hub.
$php_path = ((x($a->config,'php_path') && strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
proc_close(proc_open("\"$php_path\" \"include/poller.php\" \"$contact_id\" &", array(), $foo));
// create a follow slap // create a follow slap