finish updating zot_finger instances

Zotlabs/Daemon/Gprobe.php

@@ -22,9 +22,8 @@ class Gprobe {
 		);
 
 		if(! $r) {
-			$x = zot_finger($url,null);
-			if($x['success']) {
-				$j = json_decode($x['body'],true);
+			$j = \Zotlabs\Zot\Finger::run($url,null);
+			if($j['success']) {
 				$y = import_xchan($j);
 			}
 		}

Zotlabs/Module/Chanview.php

@@ -62,10 +62,8 @@ class Chanview extends \Zotlabs\Web\Controller {
 			}
 	
 			if($_REQUEST['address']) {
-				$ret = zot_finger($_REQUEST['address'],null);
-				if($ret['success']) {
-					$j = json_decode($ret['body'],true);
-					if($j)
+				$j = \Zotlabs\Zot\Finger::run($_REQUEST['address'],null);
+				if($j['success']) {
 					import_xchan($j);
 					$r = q("select * from xchan where xchan_addr = '%s' limit 1",
 						dbesc($_REQUEST['address'])
@@ -73,7 +71,6 @@ class Chanview extends \Zotlabs\Web\Controller {
 					if($r)
 						\App::$poi = $r[0];
 				}
-	
 			}
 		}
 	

Zotlabs/Module/Magic.php

@@ -47,10 +47,8 @@ class Magic extends \Zotlabs\Web\Controller {
 			 *
 			 */
 	
-			$ret = zot_finger((($addr) ? $addr : '[system]@' . $parsed['host']),null);
-			if($ret['success']) {
-				$j = json_decode($ret['body'],true);
-				if($j)
+			$j = \Zotlabs\Zot\Finger::run((($addr) ? $addr : '[system]@' . $parsed['host']),null);
+			if($j['success']) {
 				import_xchan($j);
 	
 				// Now try again

Zotlabs/Module/Mail.php

@@ -32,17 +32,16 @@ class Mail extends \Zotlabs\Web\Controller {
 		if(! $recipient) {
 			$channel = \App::get_channel();
 	
-			$ret = zot_finger($rstr,$channel);
+			$j = \Zotlabs\Zot\Finger::run($rstr,$channel);
 	
-			if(! $ret['success']) {
+			if(! $j['success']) {
 				notice( t('Unable to lookup recipient.') . EOL);
 				return;
 			} 
-			$j = json_decode($ret['body'],true);
 	
 			logger('message_post: lookup: ' . $url . ' ' . print_r($j,true));
 	
-			if(! ($j['success'] && $j['guid'])) {
+			if(! $j['guid']) {
 				notice( t('Unable to communicate with requested channel.'));
 				return;
 			}

Zotlabs/Module/Regdir.php

@@ -60,16 +60,13 @@ class Regdir extends \Zotlabs\Web\Controller {
 				json_return_and_die($result);
 			}
 	
-			$f = zot_finger('[system]@' . $m['host']);
-			if($f['success']) {
-				$j = json_decode($f['body'],true);
+			$j = \Zotlabs\Zot\Finger::run('[system]@' . $m['host']);
 			if($j['success'] && $j['guid']) {
 				$x = import_xchan($j);
 				if($x['success']) {
 					$result['success'] = true;
 				}
 			}
-			}
 	
 			if(! $result['success'])
 				$valid = 0;

Zotlabs/Zot/Auth.php

@@ -80,10 +80,8 @@ class Auth {
 
 		if(! $x) {
 			// finger them if they can't be found.
-			$ret = zot_finger($address, null);
-			if ($ret['success']) {
-				$j = json_decode($ret['body'], true);
-				if($j)
+			$j = Finger::run($address, null);
+			if ($j['success']) {
 				import_xchan($j);
 				$x = q("select * from hubloc left join xchan on xchan_hash = hubloc_hash 
 					where hubloc_addr = '%s' order by hubloc_id desc",

include/dir_fns.php

@@ -69,9 +69,8 @@ function check_upstream_directory() {
 	if ($directory) {
 		$h = parse_url($directory);
 		if ($h) {
-			$x = zot_finger('[system]@' . $h['host']);
-			if ($x['success']) {
-				$j = json_decode($x['body'], true);
+			$j = Zotlabs\Zot\Finger::run('[system]@' . $h['host']);
+			if ($j['success']) {
 				if (array_key_exists('site', $j) && array_key_exists('directory_mode', $j['site'])) {
 					if ($j['site']['directory_mode'] === 'normal') {
 						$isadir = false;

include/follow.php

@@ -56,11 +56,11 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false)
 	if($arr['channel']['success']) 
 		$ret = $arr['channel'];
 	elseif(! $is_http)
-		$ret = zot_finger($url,$channel);
+		$ret = Zotlabs\Zot\Finger::run($url,$channel);
 
-	if($ret && $ret['success']) {
+	if($ret && is_array($ret) && $ret['success']) {
 		$is_red = true;
-		$j = json_decode($ret['body'],true);
+		$j = $ret;
 	}
 
 	$my_perms = get_channel_default_perms($uid);

include/socgraph.php

@@ -152,10 +152,8 @@ function poco_load($xchan = '', $url = null) {
 		if(($x !== false) && (! count($x))) {
 			if($address) {
 				if($network === 'zot') {
-					$z = zot_finger($address,null);
-					if($z['success']) {
-						$j = json_decode($z['body'],true);
-						if($j)
+					$j = Zotlabs\Zot\Finger::run($address,null);
+					if($j['success']) {
 						import_xchan($j);
 					}
 					$x = q("select xchan_hash from xchan where xchan_hash = '%s' limit 1",

util/fresh

@@ -68,9 +68,9 @@ function process_command($line) {
 
 		case 'finger':
 			if(argv(1)) {
-				$x = zot_finger(argv(1),$channel);
+				$x = Zotlabs\Zot\Finger::run(argv(1),$channel);
 				if($x['success'])
-					echo jindent($x['body']);
+					echo jindent($x);
 			}
 			break;