structures for batch mode (Diaspora/zot)

3 files changed, 62 insertions, 27 deletions

diff --git a/include/Scrape.php b/include/Scrape.php
index 58468a40d..0115bf2e7 100644
--- a/include/Scrape.php
+++ b/include/Scrape.php
@@ -496,8 +496,10 @@ function probe_url($url, $mode = PROBE_NORMAL) {
 	}
 
 	if($diaspora && $diaspora_base && $diaspora_guid) {
-		if($mode == PROBE_DIASPORA || ! $notify)
+		if($mode == PROBE_DIASPORA || ! $notify) {
 			$notify = $diaspora_base . 'receive/users/' . $diaspora_guid;
+			$batch  = $diaspora_base . 'receive/public' ;
+		}
 		if(strpos($url,'@'))
 			$addr = str_replace('acct:', '', $url);
 	}			
@@ -675,6 +677,7 @@ function probe_url($url, $mode = PROBE_NORMAL) {
 	$result['nick'] = $vcard['nick'];
 	$result['url'] = $profile;
 	$result['addr'] = $addr;
+	$result['batch'] = $batch;
 	$result['notify'] = $notify;
 	$result['poll'] = $poll;
 	$result['request'] = $request;
diff --git a/include/diaspora.php b/include/diaspora.php
index 425bc722f..94c4e3098 100644
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -68,6 +68,7 @@ function diaspora_get_contact_by_handle($uid,$handle) {
 }
 
 function find_diaspora_person_by_handle($handle) {
+	$update = false;
 	$r = q("select * from fcontact where network = '%s' and addr = '%s' limit 1",
 		dbesc(NETWORK_DIASPORA),
 		dbesc($handle)
@@ -75,18 +76,14 @@ function find_diaspora_person_by_handle($handle) {
 	if(count($r)) {
 		// update record occasionally so it doesn't get stale
 		$d = strtotime($r[0]['updated'] . ' +00:00');
-		if($d < strtotime('now - 14 days')) {
-			q("delete from fcontact where id = %d limit 1",
-				intval($r[0]['id'])
-			);
-		}
-		else
+		if($d > strtotime('now - 14 days'))
 			return $r[0];
+		$update = true;
 	}
 	require_once('include/Scrape.php');
 	$r = probe_url($handle, PROBE_DIASPORA);
 	if((count($r)) && ($r['network'] === NETWORK_DIASPORA)) {
-		add_fcontact($r);
+		add_fcontact($r,$update);
 		return ($r);
 	}
 	return false;
diff --git a/include/network.php b/include/network.php
index deb257ff3..ec99d1e0d 100644
--- a/include/network.php
+++ b/include/network.php
@@ -701,24 +701,59 @@ function parse_xml_string($s,$strict = true) {
 	return $x;
 }}
 
-function add_fcontact($arr) {
-
-	$r = q("insert into fcontact ( `url`,`name`,`photo`,`request`,`nick`,`addr`,
-		`notify`,`poll`,`confirm`,`network`,`alias`,`pubkey`,`updated` )
-		values('%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s')",
-		dbesc($arr['url']),
-		dbesc($arr['name']),
-		dbesc($arr['photo']),
-		dbesc($arr['request']),
-		dbesc($arr['nick']),
-		dbesc($arr['addr']),
-		dbesc($arr['notify']),
-		dbesc($arr['poll']),
-		dbesc($arr['confirm']),
-		dbesc($arr['network']),
-		dbesc($arr['alias']),
-		dbesc($arr['pubkey']),
-		dbesc(datetime_convert())
-	);
+function add_fcontact($arr,$update = false) {
+
+	if($update) {
+		$r = q("UPDATE `fcontact` SET
+			`name` = '%s',
+			`photo` = '%s',
+			`request` = '%s',
+			`nick` = '%s',
+			`addr` = '%s',
+			`batch` = '%s',
+			`notify` = '%s',
+			`poll` = '%s',
+			`confirm` = '%s',
+			`alias` = '%s',
+			`pubkey` = '%s',
+			`updated` = '%s'
+			WHERE `url` = '%s' AND `network` = '%s' LIMIT 1", 
+			dbesc($arr['name']),
+			dbesc($arr['photo']),
+			dbesc($arr['request']),
+			dbesc($arr['nick']),
+			dbesc($arr['addr']),
+			dbesc($arr['batch']),
+			dbesc($arr['notify']),
+			dbesc($arr['poll']),
+			dbesc($arr['confirm']),
+			dbesc($arr['network']),
+			dbesc($arr['alias']),
+			dbesc($arr['pubkey']),
+			dbesc(datetime_convert()),
+			dbesc($arr['url']),
+			dbesc($arr['network'])
+		);
+	}
+	else {
+		$r = q("insert into fcontact ( `url`,`name`,`photo`,`request`,`nick`,`addr`,
+			`batch`, `notify`,`poll`,`confirm`,`network`,`alias`,`pubkey`,`updated` )
+			values('%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s')",
+			dbesc($arr['url']),
+			dbesc($arr['name']),
+			dbesc($arr['photo']),
+			dbesc($arr['request']),
+			dbesc($arr['nick']),
+			dbesc($arr['addr']),
+			dbesc($arr['batch']),
+			dbesc($arr['notify']),
+			dbesc($arr['poll']),
+			dbesc($arr['confirm']),
+			dbesc($arr['network']),
+			dbesc($arr['alias']),
+			dbesc($arr['pubkey']),
+			dbesc(datetime_convert())
+		);
+	}
 	return $r;
 }