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

diff --git a/include/diaspora.php b/include/diaspora.php
index 422e7fc576045bdffdbe1c9c4f76689539d9e04f..5aadef884c362c13453cc374328b4ee3c155ce71 100644 (file)
--- 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 afb907f0999d1ce5f6d8bdf01058c2929533ea2c..8572b53dde1647747f2a0b4f6cf3629aff3a903f 100644 (file)
--- 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 4088178c033b0d602dea9814296fcad9ea463325..4dacb5d81707c9528ae6d9729be42a80dbb2b956 100644 (file)
--- 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