diff options
| author | Mario <mario@mariovavti.com> | 2021-02-17 20:16:20 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2021-02-17 20:16:20 +0000 |
| commit | c3ec5d4d6ac48988b70d17b0b08b35da92cfa24f (patch) | |
| tree | 4982e681a49fb62e0f4d94bc7d34618e84370eed /Zotlabs/Daemon | |
| parent | 0aeb4d6fb5ebb18ff2814472db000fbdf321c1e2 (diff) | |
| download | volse-hubzilla-c3ec5d4d6ac48988b70d17b0b08b35da92cfa24f.tar.gz volse-hubzilla-c3ec5d4d6ac48988b70d17b0b08b35da92cfa24f.tar.bz2 volse-hubzilla-c3ec5d4d6ac48988b70d17b0b08b35da92cfa24f.zip | |
do not try to fetch legacy zot zotfeed - they will not return anything useful
Diffstat (limited to 'Zotlabs/Daemon')
| -rw-r--r-- | Zotlabs/Daemon/Onepoll.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Zotlabs/Daemon/Onepoll.php b/Zotlabs/Daemon/Onepoll.php index 2200276e0..85394c8d0 100644 --- a/Zotlabs/Daemon/Onepoll.php +++ b/Zotlabs/Daemon/Onepoll.php @@ -24,7 +24,7 @@ class Onepoll { } $contacts = q("SELECT abook.*, xchan.*, account.* - FROM abook LEFT JOIN account on abook_account = account_id left join xchan on xchan_hash = abook_xchan + FROM abook LEFT JOIN account on abook_account = account_id left join xchan on xchan_hash = abook_xchan where abook_id = %d and abook_pending = 0 and abook_archived = 0 and abook_blocked = 0 and abook_ignored = 0 AND (( account_flags = %d ) OR ( account_flags = %d )) limit 1", @@ -52,7 +52,6 @@ class Onepoll { logger("onepoll: poll: ({$contact['id']}) IMPORTER: {$importer['xchan_name']}, CONTACT: {$contact['xchan_name']}"); - // TODO: unused $last_update = ((($contact['abook_updated'] === $contact['abook_created']) || ($contact['abook_updated'] <= NULL_DATE)) ? datetime_convert('UTC', 'UTC', 'now - 7 days') : datetime_convert('UTC', 'UTC', $contact['abook_updated'] . ' - 2 days') @@ -120,7 +119,7 @@ class Onepoll { if (!$can_send_stream) $fetch_feed = false; - if ($fetch_feed) { + if ($fetch_feed && $contact['xchan_network'] !== 'zot') { $max = intval(get_config('system', 'max_imported_posts', 30)); |