refresh now works on poller runs

2 files changed, 17 insertions, 21 deletions

diff --git a/include/onepoll.php b/include/onepoll.php
index 131f02fad..a9fc0b2f3 100644
--- a/include/onepoll.php
+++ b/include/onepoll.php
@@ -2,7 +2,7 @@
 
 require_once('boot.php');
 require_once('include/cli_startup.php');
-
+require_once('include/zot.php');
 
 function onepoll_run($argv, $argc){
 
@@ -30,19 +30,17 @@ function onepoll_run($argv, $argc){
 	$d = datetime_convert();
 
 
+
 	$contacts = q("SELECT abook.*, xchan.*, account.*
 		FROM abook LEFT JOIN account on abook_account = account_id left join xchan on xchan_hash = abook_xchan 
 		where abook_id = %d
-		AND not ( abook_flags & %d ) AND not ( abook_flags & %d ) 
-		AND not ( abook_flags & %d ) AND not ( abook_flags & %d ) 
-		AND not ( abook_flags & %d ) AND ( account_flags & %d ) $abandon_sql ORDER BY RAND()",
+		AND (( abook_flags = %d ) OR ( abook_flags = %d )) 
+		AND (( account_flags = %d ) OR ( account_flags = %d )) ORDER BY RAND()",
 		intval($contact_id),
-		intval(ABOOK_FLAG_BLOCKED),
-		intval(ABOOK_FLAG_IGNORED),
-		intval(ABOOK_FLAG_PENDING),
-		intval(ABOOK_FLAG_ARCHIVED),
-		intval(ABOOK_FLAG_SELF),
-		intval(ACCOUNT_OK)
+		intval(ABOOK_FLAG_HIDDEN),
+		intval(0),
+		intval(ACCOUNT_OK),
+		intval(ACCOUNT_UNVERIFIED)
 	);
 
 	if(! $contacts) {
@@ -62,6 +60,7 @@ function onepoll_run($argv, $argc){
 	$r = q("SELECT * from channel left join xchan on channel_hash = xchan_hash where channel_id = %d limit 1",
 		intval($importer_uid)
 	);
+
 	if(! $r)
 		return;
 
diff --git a/include/poller.php b/include/poller.php
index 3052ace64..00e336453 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -103,18 +103,15 @@ function poller_run($argv, $argc){
 	);
 
 	$contacts = q("SELECT abook_id, abook_updated, abook_closeness, abook_channel 
-		FROM abook LEFT JOIN account on abook_account = account_id 
+		FROM abook LEFT JOIN account on abook_account = account_id where 1
 		$sql_extra 
-		AND not ( abook_flags & %d ) AND not ( abook_flags & %d ) 
-		AND not ( abook_flags & %d ) AND not ( abook_flags & %d ) 
-		AND not ( abook_flags & %d ) AND ( account_flags & %d ) $abandon_sql ORDER BY RAND()",
-
-		intval(ABOOK_FLAG_BLOCKED),
-		intval(ABOOK_FLAG_IGNORED),
-		intval(ABOOK_FLAG_PENDING),
-		intval(ABOOK_FLAG_ARCHIVED),
-		intval(ABOOK_FLAG_SELF),
-		intval(ACCOUNT_OK)
+		AND (( abook_flags = %d ) OR  ( abook_flags = %d )) 
+		AND (( account_flags = %d ) OR ( account_flags = %d )) $abandon_sql ORDER BY RAND()",
+
+		intval(ABOOK_FLAG_HIDDEN),
+		intval(0),
+		intval(ACCOUNT_OK),
+		intval(ACCOUNT_UNVERIFIED)     // FIXME
 
 	);