tobias/friendica
1
0
Fork 0
Code Pull requests Activity

more improvements in twitter handling, reduce duplicates from FB when double friended

Browse source
This commit is contained in:
Friendika 2011-05-22 18:40:00 -07:00
parent a803652653
commit 44a22c2915
3 changed files with 96 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

138
include/Scrape.php
View file

@ -292,7 +292,9 @@ function probe_url($url) {
$diaspora = false; $diaspora = false;
$email_conversant = false; $email_conversant = false;
if($url) { $twitter = ((strpos($url,'twitter.com') !== false) ? true : false);
if(! $twitter) {
$links = lrdd($url); $links = lrdd($url);
if(count($links)) { if(count($links)) {
@ -413,76 +415,94 @@ function probe_url($url) {
$profile = $url; $profile = $url;
} }
if($twitter) {
logger('twitter: setup');
$tid = basename($url);
$tapi = 'https://api.twitter.com/1/statuses/user_timeline.rss';
if(intval($tid))
$poll = $tapi . '?user_id=' . $tid;
else
$poll = $tapi . '?screen_name=' . $tid;
$profile = 'http://twitter.com/!#/' . $tid;
}
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)) {
if(((! isset($vcard)) && (! $poll)) || ($twitter)) {
$ret = scrape_feed($url); $feedret = scrape_feed($url);
logger('probe_url: scrape_feed returns: ' . print_r($ret,true), LOGGER_DATA); logger('probe_url: scrape_feed returns: ' . print_r($feedret,true), LOGGER_DATA);
if(count($ret) && ($ret['feed_atom'] || $ret['feed_rss'])) { if(count($feedret) && ($feedret['feed_atom'] || $feedret['feed_rss'])) {
$poll = ((x($ret,'feed_atom')) ? unamp($ret['feed_atom']) : unamp($ret['feed_rss'])); $poll = ((x($feedret,'feed_atom')) ? unamp($feedret['feed_atom']) : unamp($feedret['feed_rss']));
$vcard = array(); $vcard = array();
if(x($ret,'photo')) }
$vcard['photo'] = $ret['photo'];
require_once('simplepie/simplepie.inc');
$feed = new SimplePie();
$xml = fetch_url($poll);
$feed->set_raw_data($xml); if(x($feedret,'photo'))
$vcard['photo'] = $feedret['photo'];
require_once('simplepie/simplepie.inc');
$feed = new SimplePie();
$xml = fetch_url($poll);
$feed->init(); $feed->set_raw_data($xml);
if(! x($vcard,'photo')) $feed->init();
$vcard['photo'] = $feed->get_image_url();
$author = $feed->get_author(); if(! x($vcard,'photo'))
if($author) { $vcard['photo'] = $feed->get_image_url();
$vcard['fn'] = unxmlify(trim($author->get_name())); $author = $feed->get_author();
if(! $vcard['fn']) if($author) {
$vcard['fn'] = trim(unxmlify($author->get_email())); $vcard['fn'] = unxmlify(trim($author->get_name()));
if(strpos($vcard['fn'],'@') !== false) if(! $vcard['fn'])
$vcard['fn'] = substr($vcard['fn'],0,strpos($vcard['fn'],'@')); $vcard['fn'] = trim(unxmlify($author->get_email()));
$vcard['nick'] = strtolower(notags(unxmlify($vcard['fn']))); if(strpos($vcard['fn'],'@') !== false)
if(strpos($vcard['nick'],' ')) $vcard['fn'] = substr($vcard['fn'],0,strpos($vcard['fn'],'@'));
$vcard['nick'] = trim(substr($vcard['nick'],0,strpos($vcard['nick'],' '))); $email = unxmlify($author->get_email());
$email = unxmlify($author->get_email()); }
} else {
else { $item = $feed->get_item(0);
$item = $feed->get_item(0); if($item) {
if($item) { $author = $item->get_author();
$author = $item->get_author(); if($author) {
if($author) { $vcard['fn'] = trim(unxmlify($author->get_name()));
$vcard['fn'] = trim(unxmlify($author->get_name())); if(! $vcard['fn'])
if(! $vcard['fn']) $vcard['fn'] = trim(unxmlify($author->get_email()));
$vcard['fn'] = trim(unxmlify($author->get_email())); if(strpos($vcard['fn'],'@') !== false)
if(strpos($vcard['fn'],'@') !== false) $vcard['fn'] = substr($vcard['fn'],0,strpos($vcard['fn'],'@'));
$vcard['fn'] = substr($vcard['fn'],0,strpos($vcard['fn'],'@')); $email = unxmlify($author->get_email());
$vcard['nick'] = strtolower(unxmlify($vcard['fn'])); }
if(strpos($vcard['nick'],' ')) if(! $vcard['photo']) {
$vcard['nick'] = trim(substr($vcard['nick'],0,strpos($vcard['nick'],' '))); $rawmedia = $item->get_item_tags('http://search.yahoo.com/mrss/','thumbnail');
$email = unxmlify($author->get_email()); if($rawmedia && $rawmedia[0]['attribs']['']['url'])
} $vcard['photo'] = unxmlify($rawmedia[0]['attribs']['']['url']);
if(! $vcard['photo']) {
$rawmedia = $item->get_item_tags('http://search.yahoo.com/mrss/','thumbnail');
if($rawmedia && $rawmedia[0]['attribs']['']['url'])
$vcard['photo'] = unxmlify($rawmedia[0]['attribs']['']['url']);
}
} }
} }
if((! $vcard['photo']) && strlen($email))
$vcard['photo'] = gravatar_img($email);
if($poll === $profile)
$lnk = $feed->get_permalink();
if(isset($lnk) && strlen($lnk))
$profile = $lnk;
if(! (x($vcard,'fn')))
$vcard['fn'] = notags($feed->get_title());
if(! (x($vcard,'fn')))
$vcard['fn'] = notags($feed->get_description());
$network = 'feed';
$priority = 2;
} }
if((! $vcard['photo']) && strlen($email))
$vcard['photo'] = gravatar_img($email);
if($poll === $profile)
$lnk = $feed->get_permalink();
if(isset($lnk) && strlen($lnk))
$profile = $lnk;
if(! (x($vcard,'fn')))
$vcard['fn'] = notags($feed->get_title());
if(! (x($vcard,'fn')))
$vcard['fn'] = notags($feed->get_description());
if(strpos($vcard['fn'],'Twitter / ') !== false) {
$vcard['fn'] = substr($vcard['fn'],strpos($vcard['fn'],'/')+1);
$vcard['fn'] = trim($vcard['fn']);
}
if(! x($vcard,'nick')) {
$vcard['nick'] = strtolower(notags(unxmlify($vcard['fn'])));
if(strpos($vcard['nick'],' '))
$vcard['nick'] = trim(substr($vcard['nick'],0,strpos($vcard['nick'],' ')));
}
$network = 'feed';
$priority = 2;
} }
} }

8
include/items.php
View file

@ -384,6 +384,9 @@ function get_atom_elements($feed,$item) {
else else
$res['private'] = 0; $res['private'] = 0;
$extid = $item->get_item_tags(NAMESPACE_DFRN,'extid');
if($extid && $extid[0]['data'])
$res['extid'] = $extid[0]['data'];
$rawlocation = $item->get_item_tags(NAMESPACE_DFRN, 'location'); $rawlocation = $item->get_item_tags(NAMESPACE_DFRN, 'location');
if($rawlocation) if($rawlocation)
@ -634,6 +637,7 @@ function item_store($arr,$force_parent = false) {
$arr['wall'] = ((x($arr,'wall')) ? intval($arr['wall']) : 0); $arr['wall'] = ((x($arr,'wall')) ? intval($arr['wall']) : 0);
$arr['uri'] = ((x($arr,'uri')) ? notags(trim($arr['uri'])) : random_string()); $arr['uri'] = ((x($arr,'uri')) ? notags(trim($arr['uri'])) : random_string());
$arr['extid'] = ((x($arr,'extid')) ? notags(trim($arr['extid'])) : '');
$arr['author-name'] = ((x($arr,'author-name')) ? notags(trim($arr['author-name'])) : ''); $arr['author-name'] = ((x($arr,'author-name')) ? notags(trim($arr['author-name'])) : '');
$arr['author-link'] = ((x($arr,'author-link')) ? notags(trim($arr['author-link'])) : ''); $arr['author-link'] = ((x($arr,'author-link')) ? notags(trim($arr['author-link'])) : '');
$arr['author-avatar'] = ((x($arr,'author-avatar')) ? notags(trim($arr['author-avatar'])) : ''); $arr['author-avatar'] = ((x($arr,'author-avatar')) ? notags(trim($arr['author-avatar'])) : '');
@ -1568,6 +1572,10 @@ function atom_entry($item,$type,$author,$owner,$comment = false) {
if(($item['private']) || strlen($item['allow_cid']) || strlen($item['allow_gid']) || strlen($item['deny_cid']) || strlen($item['deny_gid'])) if(($item['private']) || strlen($item['allow_cid']) || strlen($item['allow_gid']) || strlen($item['deny_cid']) || strlen($item['deny_gid']))
$o .= '<dfrn:private>1</dfrn:private>' . "\r\n"; $o .= '<dfrn:private>1</dfrn:private>' . "\r\n";
if($item['extid'])
$o .= '<dfrn:extid>' . $item['extid'] . '</dfrn:extid>' . "\r\n";
$verb = construct_verb($item); $verb = construct_verb($item);
$o .= '<as:verb>' . xmlify($verb) . '</as:verb>' . "\r\n"; $o .= '<as:verb>' . xmlify($verb) . '</as:verb>' . "\r\n";
$actobj = construct_activity_object($item); $actobj = construct_activity_object($item);

10
mod/follow.php
View file

@ -12,7 +12,7 @@ function follow_post(&$a) {
$url = $orig_url = notags(trim($_POST['url'])); $url = $orig_url = notags(trim($_POST['url']));
// remove ajax junk // remove ajax junk, e.g. Twitter
$url = str_replace('/#!/','/',$url); $url = str_replace('/#!/','/',$url);
@ -41,6 +41,14 @@ function follow_post(&$a) {
if(! ((x($ret,'name')) && (x($ret,'poll')) && ((x($ret,'url')) || (x($ret,'addr'))))) { if(! ((x($ret,'name')) && (x($ret,'poll')) && ((x($ret,'url')) || (x($ret,'addr'))))) {
notice( t('The profile address specified does not provide adequate information.') . EOL); notice( t('The profile address specified does not provide adequate information.') . EOL);
if(! x($ret,'poll'))
notice( t('No compatible communication protocols or feeds were discovered.') . EOL);
if(! x($ret,'name'))
notice( t('An author or name was not found.') . EOL);
if(! x($ret,'url'))
notice( t('No browser URL could be matched to this address.') . EOL);
if(strpos($url,'@') !== false)
notice('Unable to match @-style Identity Address with a known protocol or email contact');
goaway($_SESSION['return_url']); goaway($_SESSION['return_url']);
} }