From 2df7251b349fa3ef9650cf8adb1fb680f253930d Mon Sep 17 00:00:00 2001 From: Friendika Date: Thu, 18 Aug 2011 17:30:06 -0700 Subject: notifier issue --- include/notifier.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'include/notifier.php') diff --git a/include/notifier.php b/include/notifier.php index 15fb38534..89c36e434 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -587,8 +587,9 @@ function notifier_run($argv, $argc){ */ $r = q("SELECT `id`, `name` FROM `contact` - WHERE `network` = NETWORK_DFRN AND `uid` = %d AND `blocked` = 0 AND `pending` = 0 + WHERE `network` = '%s' AND `uid` = %d AND `blocked` = 0 AND `pending` = 0 AND `rel` != %d ", + dbesc(NETWORK_DFRN), intval($owner['uid']), intval(CONTACT_IS_SHARING) ); -- cgit v1.2.3 From d2c6c21a88239e956b7e6a3c5a41a8a819502991 Mon Sep 17 00:00:00 2001 From: Friendika Date: Thu, 18 Aug 2011 21:09:44 -0700 Subject: lots more diaspora communications - can see light at the end --- include/notifier.php | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'include/notifier.php') diff --git a/include/notifier.php b/include/notifier.php index 89c36e434..afb907f09 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -504,20 +504,24 @@ function notifier_run($argv, $argc){ case NETWORK_DIASPORA: if(get_config('system','dfrn_only') || (! get_config('diaspora_enabled')) || (! $normal_mode)) break; - - if($target_item['deleted']) { - // diaspora delete, (check for like) - + + if($target_item['verb'] === ACTIVITY_DISLIKE) { + // unsupported + break; + } + elseif($target_item['deleted'] && (! $parent_item['verb'] === ACTIVITY_LIKE)) { + // diaspora delete, + diaspora_send_retraction($target_item,$owner,$contact); break; } elseif($followup) { - // send to owner to relay - + // send comments, likes and retractions of likes to owner to relay + diaspora_send_followup($target_item,$owner,$contact); break; } elseif($target_item['parent'] != $target_item['id']) { - // we are the relay - + // we are the relay - send comments, likes and unlikes to our conversants + diaspora_send_relay($target_item,$owner,$contact); break; } elseif($top_level) { -- cgit v1.2.3 From c05c20aa56eaba3102e6c56a0160999352619b61 Mon Sep 17 00:00:00 2001 From: Friendika Date: Thu, 18 Aug 2011 21:31:34 -0700 Subject: set writable (e.g. writeable) flag for Diaspora contacts --- include/notifier.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/notifier.php') 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. * -- cgit v1.2.3 From 395faae0b2eee4a134799f55b17784487088eb41 Mon Sep 17 00:00:00 2001 From: Friendika Date: Fri, 19 Aug 2011 02:24:30 -0700 Subject: double url encode diaspora communications --- include/notifier.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'include/notifier.php') diff --git a/include/notifier.php b/include/notifier.php index 8572b53dd..cf8871fb9 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -502,7 +502,8 @@ function notifier_run($argv, $argc){ } break; case NETWORK_DIASPORA: - if(get_config('system','dfrn_only') || (! get_config('diaspora_enabled')) || (! $normal_mode)) + require_once('include/diaspora.php'); + if(get_config('system','dfrn_only') || (! get_config('system','diaspora_enabled')) || (! $normal_mode)) break; if($target_item['verb'] === ACTIVITY_DISLIKE) { -- cgit v1.2.3