From 846a9813b23911ae2a87d87fb6fd9f188ed84dc0 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 1 Oct 2012 18:02:11 -0700 Subject: here's where the heavy lifting begins - everything is likely to be broken for quite some time as we add location and db independence to items and conversations and work through the rest of the permissions and how to federate the buggers. --- include/Scrape.php | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'include/Scrape.php') diff --git a/include/Scrape.php b/include/Scrape.php index 2e5ed7d32..806106ef1 100644 --- a/include/Scrape.php +++ b/include/Scrape.php @@ -438,10 +438,10 @@ function probe_url($url, $mode = PROBE_NORMAL) { $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) @@ -523,6 +523,13 @@ function probe_url($url, $mode = PROBE_NORMAL) { logger('probe_url: scrape_vcard: ' . print_r($vcard,true), LOGGER_DATA); } + 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); -- cgit v1.2.3