aboutsummaryrefslogtreecommitdiffstats
path: root/include/poller.php
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-03-04 14:35:42 -0800
committerfriendica <info@friendica.com>2014-03-04 14:35:42 -0800
commit86d60f572f6accb086f7cd4271ababde2c5d3669 (patch)
tree4db82a891da7b73be248f083770716cb3f1099f5 /include/poller.php
parentf2c8559170f7271a60df624d4222a2bc88435687 (diff)
downloadvolse-hubzilla-86d60f572f6accb086f7cd4271ababde2c5d3669.tar.gz
volse-hubzilla-86d60f572f6accb086f7cd4271ababde2c5d3669.tar.bz2
volse-hubzilla-86d60f572f6accb086f7cd4271ababde2c5d3669.zip
change flags for one-way connections from hidden to unconnected so we can still use hidden for - well hiding connections
Diffstat (limited to 'include/poller.php')
-rw-r--r--include/poller.php9
1 files changed, 3 insertions, 6 deletions
diff --git a/include/poller.php b/include/poller.php
index 649da30f6..423ee46c1 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -184,9 +184,7 @@ function poller_run($argv, $argc){
if(! $restart)
proc_run('php','include/cronhooks.php');
- // Only poll from those with suitable relationships,
- // and which have a polling address and ignore Diaspora since
- // we are unable to match those posts with a Diaspora GUID and prevent duplicates.
+ // Only poll from those with suitable relationships
$abandon_sql = (($abandon_days)
? sprintf(" AND account_lastlog > UTC_TIMESTAMP() - INTERVAL %d DAY ", intval($abandon_days))
@@ -197,10 +195,9 @@ function poller_run($argv, $argc){
$contacts = q("SELECT abook_id, abook_flags, abook_updated, abook_connected, abook_closeness, abook_channel
FROM abook LEFT JOIN account on abook_account = account_id where 1
$sql_extra
- AND (( abook_flags = %d ) OR ( abook_flags = %d ))
+ 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(ABOOK_FLAG_HIDDEN|ABOOK_FLAG_PENDING|ABOOK_FLAG_UNCONNECTED),
intval(0),
intval(ACCOUNT_OK),
intval(ACCOUNT_UNVERIFIED) // FIXME