change default affinity (abook_closeness) to 80 for all new connections going forward (was 99). This way it can be adjusted down later without requiring you to change all your existing connections upward (since your existing connections are likely all sitting at 99 at the moment). The default setting is also configurable with a pconfig system.new_abook_closeness

4 files changed, 22 insertions, 4 deletions

diff --git a/include/diaspora.php b/include/diaspora.php
index 553c7474c..7295b4261 100755
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -709,13 +709,19 @@ function diaspora_request($importer,$xml) {
 				
 	$their_perms = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_PHOTOS|PERMS_R_ABOOK|PERMS_W_STREAM|PERMS_W_COMMENT|PERMS_W_MAIL|PERMS_W_CHAT|PERMS_R_STORAGE|PERMS_R_PAGES;
 
+
+	$closeness = get_pconfig($importer['channel_id'],'system','new_abook_closeness');
+	if($closeness === false)
+		$closeness = 80;
+
+
 	$r = q("insert into abook ( abook_account, abook_channel, abook_xchan, abook_my_perms, abook_their_perms, abook_closeness, abook_rating, abook_created, abook_updated, abook_connected, abook_dob, abook_flags) values ( %d, %d, '%s', %d, %d, %d, %d, '%s', '%s', '%s', '%s', %d )",
 		intval($importer['channel_account_id']),
 		intval($importer['channel_id']),
 		dbesc($ret['xchan_hash']),
 		intval($default_perms),
 		intval($their_perms),
-		intval(99),
+		intval($closeness),
 		intval(0),
 		dbesc(datetime_convert()),
 		dbesc(datetime_convert()),
diff --git a/include/follow.php b/include/follow.php
index 2d6791420..e13b5f775 100644
--- a/include/follow.php
+++ b/include/follow.php
@@ -227,10 +227,16 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false)
 		);		
 	}
 	else {
-		$r = q("insert into abook ( abook_account, abook_channel, abook_xchan, abook_flags, abook_their_perms, abook_my_perms, abook_created, abook_updated )
+
+		$closeness = get_pconfig($uid,'system','new_abook_closeness');
+		if($closeness === false)
+			$closeness = 80;
+
+		$r = q("insert into abook ( abook_account, abook_channel, abook_closeness, abook_xchan, abook_flags, abook_their_perms, abook_my_perms, abook_created, abook_updated )
 			values( %d, %d, '%s', %d, %d, %d, '%s', '%s' ) ",
 			intval($aid),
 			intval($uid),
+			intval($closeness),
 			dbesc($xchan_hash),
 			intval(($is_http) ? ABOOK_FLAG_FEED : 0),
 			intval(($is_http) ? $their_perms|PERMS_R_STREAM|PERMS_A_REPUBLISH : $their_perms),
diff --git a/include/zot.php b/include/zot.php
index 670583929..c9019ca7a 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -464,9 +464,15 @@ function zot_refresh($them,$channel = null, $force = false) {
 				// Keep original perms to check if we need to notify them
 				$previous_perms = get_all_perms($channel['channel_id'],$x['hash']);
 
-				$y = q("insert into abook ( abook_account, abook_channel, abook_xchan, abook_their_perms, abook_my_perms, abook_created, abook_updated, abook_dob, abook_flags ) values ( %d, %d, '%s', %d, %d, '%s', '%s', '%s', %d )",
+
+				$closeness = get_pconfig($channel['channel_id'],'system','new_abook_closeness');
+				if($closeness === false)
+					$closeness = 80;
+
+				$y = q("insert into abook ( abook_account, abook_channel, abook_closeness, abook_xchan, abook_their_perms, abook_my_perms, abook_created, abook_updated, abook_dob, abook_flags ) values ( %d, %d, '%s', %d, %d, '%s', '%s', '%s', %d )",
 					intval($channel['channel_account_id']),
 					intval($channel['channel_id']),
+					intval($closeness),
 					dbesc($x['hash']),
 					intval($their_perms),
 					intval($default_perms),
diff --git a/version.inc b/version.inc
index c4fb1b2d6..c02f7674a 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-03-07.964
+2015-03-08.965