$network = null;
$diaspora = false;
$diaspora_base = '';
- $diaspora_guid = '';
+ $diaspora_guid = '';
$diaspora_key = '';
$has_lrdd = false;
$email_conversant = false;
$poll = 'email ' . random_string();
$priority = 0;
$x = email_msg_meta($mbox,$msgs[0]);
- if(stristr($x->from,$orig_url))
- $adr = imap_rfc822_parse_adrlist($x->from,'');
- elseif(stristr($x->to,$orig_url))
- $adr = imap_rfc822_parse_adrlist($x->to,'');
+ if(stristr($x[0]->from,$orig_url))
+ $adr = imap_rfc822_parse_adrlist($x[0]->from,'');
+ elseif(stristr($x[0]->to,$orig_url))
+ $adr = imap_rfc822_parse_adrlist($x[0]->to,'');
if(isset($adr)) {
foreach($adr as $feadr) {
if((strcasecmp($feadr->mailbox,$name) == 0)
}
}
}
- }
+ }
if($mode == PROBE_NORMAL) {
if(strlen($zot)) {
}
if(strpos($url,'@'))
$addr = str_replace('acct:', '', $url);
- }
+ }
if($network !== NETWORK_ZOT && $network !== NETWORK_DFRN && $network !== NETWORK_MAIL) {
if($diaspora)
$vcard = scrape_vcard($hcard);
// Google doesn't use absolute url in profile photos
-
+
if((x($vcard,'photo')) && substr($vcard['photo'],0,1) == '/') {
$h = @parse_url($hcard);
if($h)
$vcard['photo'] = $h['scheme'] . '://' . $h['host'] . $vcard['photo'];
}
-
+
logger('probe_url: scrape_vcard: ' . print_r($vcard,true), LOGGER_DATA);
}
- if($twitter) {
+ if($diaspora && $addr) {
+ // Diaspora returns the name as the nick. As the nick will never be updated,
+ // let's use the Diaspora nickname (the first part of the handle) as the nick instead
+ $addr_parts = explode('@', $addr);
+ $vcard['nick'] = $addr_parts[0];
+ }
+
+ if($twitter) {
logger('twitter: setup');
$tid = basename($url);
$tapi = 'https://api.twitter.com/1/statuses/user_timeline.rss';
else
$poll = $tapi . '?screen_name=' . $tid;
$profile = 'http://twitter.com/#!/' . $tid;
- $vcard['photo'] = 'https://api.twitter.com/1/users/profile_image/' . $tid;
+ //$vcard['photo'] = 'https://api.twitter.com/1/users/profile_image/' . $tid;
+ $vcard['photo'] = 'https://api.twitter.com/1/users/profile_image?screen_name=' . $tid . '&size=bigger';
$vcard['nick'] = $tid;
- $vcard['fn'] = $tid . '@twitter';
+ $vcard['fn'] = $tid;
}
if($lastfm) {
$check_feed = false;
+ if(stristr($url,'tumblr.com') && (! stristr($url,'/rss'))) {
+ $poll = $url . '/rss';
+ $check_feed = true;
+ // Will leave it to others to figure out how to grab the avatar, which is on the $url page in the open graph meta links
+ }
+
if($twitter || ! $poll)
$check_feed = true;
if((! isset($vcard)) || (! x($vcard,'fn')) || (! $profile))
logger('probe_url: scrape_feed: headers: ' . $a->get_curl_headers(), LOGGER_DATA);
- $feed->set_raw_data($xml);
+ // Don't try and parse an empty string
+ $feed->set_raw_data(($xml) ? $xml : '<?xml version="1.0" encoding="utf-8" ?><xml></xml>');
$feed->init();
if($feed->error())