X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fpoller.php;h=d9e5282f2dd7bdab9b34a23e49f6acb8841e521c;hb=3bd2b731b2040e1025caef68e7da1f07907ae809;hp=a19f0716f6758e7c23e0506c51cb49c06b02cc50;hpb=ea9d3b06f6dbe2d7bf036ea1785a1e472f6bf890;p=friendica.git

diff --git a/include/poller.php b/include/poller.php
index a19f0716f6..d9e5282f2d 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -24,6 +24,7 @@ function poller_run($argv, $argc){
 	require_once('include/items.php');
 	require_once('include/Contact.php');
 	require_once('include/email.php');
+	require_once('include/socgraph.php');
 
 	load_config('config');
 	load_config('system');
@@ -107,13 +108,14 @@ function poller_run($argv, $argc){
 
 	$contacts = q("SELECT `contact`.`id` FROM `contact` LEFT JOIN `user` ON `user`.`uid` = `contact`.`uid` 
 		WHERE ( `rel` = %d OR `rel` = %d ) AND `poll` != ''
-		AND `network` != '%s'
+		AND NOT `network` IN ( '%s', '%s' )
 		$sql_extra 
 		AND `self` = 0 AND `contact`.`blocked` = 0 AND `contact`.`readonly` = 0 
 		AND `user`.`account_expired` = 0 $abandon_sql ORDER BY RAND()",
 		intval(CONTACT_IS_SHARING),
 		intval(CONTACT_IS_FRIEND),
-		dbesc(NETWORK_DIASPORA)
+		dbesc(NETWORK_DIASPORA),
+		dbesc(NETWORK_FACEBOOK)
 	);
 
 	if(! count($contacts)) {
@@ -136,6 +138,9 @@ function poller_run($argv, $argc){
 			if($manual_id)
 				$contact['last-update'] = '0000-00-00 00:00:00';
 
+			if($contact['network'] === NETWORK_DFRN)
+				$contact['priority'] = 2;
+
 			if($contact['priority'] || $contact['subhub']) {
 
 				$hub_update = true;
@@ -217,7 +222,7 @@ function poller_run($argv, $argc){
 
 			$importer = $r[0];
 
-			logger("poller: poll: IMPORTER: {$importer['name']}, CONTACT: {$contact['name']}");
+			logger("poller: poll: ({$contact['id']}) IMPORTER: {$importer['name']}, CONTACT: {$contact['name']}");
 
 			$last_update = (($contact['last-update'] === '0000-00-00 00:00:00') 
 				? datetime_convert('UTC','UTC','now - 30 days', ATOM_TIME)
@@ -298,6 +303,13 @@ function poller_run($argv, $argc){
 				if((intval($res->status) != 0) || (! strlen($res->challenge)) || (! strlen($res->dfrn_id)))
 					continue;
 
+				if(((float) $res->dfrn_version > 2.21) && ($contact['poco'] == '')) {
+					q("update contact set poco = '%s' where id = %d limit 1",
+						dbesc(str_replace('/profile/','/poco/', $contact['url'])),
+						intval($contact['id'])
+					);
+				}
+
 				$postvars = array();
 
 				$sent_dfrn_id = hex2bin((string) $res->dfrn_id);
@@ -521,6 +533,21 @@ function poller_run($argv, $argc){
 				intval($contact['id'])
 			);
 
+
+			// load current friends if possible.
+
+			if($contact['poco']) {	
+				$r = q("SELECT count(*) as total from glink 
+					where `cid` = %d and updated > UTC_TIMESTAMP() - INTERVAL 1 DAY",
+					intval($contact['id'])
+				);
+			}
+			if(count($r)) {
+				if(! $r[0]['total']) {
+					poco_load($contact['id'],$importer_uid,$contact['poco']);
+				}
+			}
+
 			// loop - next contact
 		}
 	}