From 38cb0a329527a07ab82c812001d22eae572d6f82 Mon Sep 17 00:00:00 2001 From: Friendika Date: Thu, 28 Apr 2011 03:14:30 -0700 Subject: [PATCH] implement contact block/ignore for NETWORK_FACEBOOK --- addon/facebook/facebook.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addon/facebook/facebook.php b/addon/facebook/facebook.php index 0a1f5238e4..26ec8c597a 100644 --- a/addon/facebook/facebook.php +++ b/addon/facebook/facebook.php @@ -594,7 +594,7 @@ function fb_consume_stream($uid,$j,$wall = false) { if($from->id == $self_id) $datarray['contact-id'] = $self[0]['id']; else { - $r = q("SELECT * FROM `contact` WHERE `notify` = '%s' AND `uid` = %d LIMIT 1", + $r = q("SELECT * FROM `contact` WHERE `notify` = '%s' AND `uid` = %d AND `blocked` = 0 AND `readonly` = 0 LIMIT 1", dbesc($from->id), intval($uid) ); @@ -671,7 +671,7 @@ function fb_consume_stream($uid,$j,$wall = false) { if($likes->id == $self_id) $likedata['contact-id'] = $self[0]['id']; else { - $r = q("SELECT * FROM `contact` WHERE `notify` = '%s' AND `uid` = %d LIMIT 1", + $r = q("SELECT * FROM `contact` WHERE `notify` = '%s' AND `uid` = %d AND `blocked` = 0 AND `readonly` = 0 LIMIT 1", dbesc($likes->id), intval($uid) ); @@ -724,7 +724,7 @@ function fb_consume_stream($uid,$j,$wall = false) { elseif(is_array($orig_post) && (x($orig_post,'contact-id'))) $cmntdata['contact-id'] = $orig_post['contact-id']; else { - $r = q("SELECT * FROM `contact` WHERE `notify` = '%s' AND `uid` = %d LIMIT 1", + $r = q("SELECT * FROM `contact` WHERE `notify` = '%s' AND `uid` = %d AND `blocked` = 0 AND `readonly` = 0 LIMIT 1", dbesc($cmnt->from->id), intval($uid) );