set writable (e.g. writeable) flag for Diaspora contacts

3 files changed, 14 insertions, 5 deletions

diff --git a/include/diaspora.php b/include/diaspora.php
index 422e7fc57..5aadef884 100644
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -308,7 +308,7 @@ function diaspora_request($importer,$xml) {
 		// That makes us friends.
 
 		if($contact['rel'] == CONTACT_IS_FOLLOWER) {
-			q("UPDATE `contact` SET `rel` = %d WHERE `id` = %d AND `uid` = %d LIMIT 1",
+			q("UPDATE `contact` SET `rel` = %d, `writable` = 1 WHERE `id` = %d AND `uid` = %d LIMIT 1",
 				intval(CONTACT_IS_FRIEND),
 				intval($contact['id']),
 				intval($importer['uid'])
diff --git a/include/notifier.php b/include/notifier.php
index afb907f09..8572b53dd 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -575,7 +575,7 @@ function notifier_run($argv, $argc){
 
 		/**
 		 *
-		 * If you have less than 150 dfrn friends and it's a public message,
+		 * If you have less than 999 dfrn friends and it's a public message,
 		 * we'll just go ahead and push them out securely with dfrn/rino.
 		 * If you've got more than that, you'll have to rely on PuSH delivery.
 		 *
diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php
index 4088178c0..4dacb5d81 100644
--- a/mod/dfrn_confirm.php
+++ b/mod/dfrn_confirm.php
@@ -360,8 +360,14 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 			}
 
 			$new_relation = $contact['rel'];
-			if($network === NETWORK_DIASPORA && $duplex)
-				$new_relation = CONTACT_IS_FRIEND;
+			$writable = $contact['writable'];
+
+			if($network === NETWORK_DIASPORA) {
+				if($duplex)
+					$new_relation = CONTACT_IS_FRIEND;
+				if($new_relation != CONTACT_IS_FOLLOWER)
+					$writable = 1;
+			}
 
 			$r = q("DELETE FROM `intro` WHERE `id` = %d AND `uid` = %d LIMIT 1",
 				intval($intro_id),
@@ -380,6 +386,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 				`blocked` = 0, 
 				`pending` = 0,
 				`network` = '%s',
+				`writable` = %d,
 				`rel` = %d
 				WHERE `id` = %d LIMIT 1
 			",
@@ -392,6 +399,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 				dbesc($notify),
 				dbesc($poll),
 				dbesc($network),
+				intval($writable),
 				intval($new_relation),
 				intval($contact_id)
 			);			
@@ -640,7 +648,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 			`blocked` = 0, 
 			`pending` = 0,
 			`duplex` = %d, 
-			`network` = 'dfrn' WHERE `id` = %d LIMIT 1
+			`network` = '%s' WHERE `id` = %d LIMIT 1
 		",
 			dbesc($photos[0]),
 			dbesc($photos[1]),
@@ -650,6 +658,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 			dbesc(datetime_convert()),
 			dbesc(datetime_convert()),
 			intval($duplex),
+			dbesc(NETWORK_DFRN),
 			intval($dfrn_record)
 		);
 		if($r === false) {    // indicates schema is messed up or total db failure