tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Merge pull request #11341 from tobiasd/20220315-getcontactstoupdate

Browse source 
PHP deprecation warning due wrong order of function parameters
This commit is contained in:
Michael Vogel 2022-03-15 09:06:43 +01:00 committed by GitHub
parent e252b5972e 02b6ac3ed3
commit a30b553c28
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/Worker/UpdateContacts.php
View file

@ -52,7 +52,7 @@ class UpdateContacts
$condition = DBA::mergeConditions($base_condition, $condition = DBA::mergeConditions($base_condition,
["`uid` != ? AND (`last-update` < ? OR (NOT `failed` AND `last-update` < ?))", ["`uid` != ? AND (`last-update` < ? OR (NOT `failed` AND `last-update` < ?))",
0, DateTimeFormat::utc('now - 1 month'), DateTimeFormat::utc('now - 1 week')]); 0, DateTimeFormat::utc('now - 1 month'), DateTimeFormat::utc('now - 1 week')]);
$ids = self::getContactsToUpdate($condition, [], $limit); $ids = self::getContactsToUpdate($condition, $limit, []);
Logger::info('Fetched federated user contacts', ['count' => count($ids)]); Logger::info('Fetched federated user contacts', ['count' => count($ids)]);
$conditions = ["`id` IN (SELECT `author-id` FROM `post` WHERE `author-id` = `contact`.`id`)", $conditions = ["`id` IN (SELECT `author-id` FROM `post` WHERE `author-id` = `contact`.`id`)",
@ -65,7 +65,7 @@ class UpdateContacts
$condition = DBA::mergeConditions($base_condition, $condition = DBA::mergeConditions($base_condition,
[$contact_condition . " AND (`last-update` < ? OR (NOT `failed` AND `last-update` < ?))", [$contact_condition . " AND (`last-update` < ? OR (NOT `failed` AND `last-update` < ?))",
DateTimeFormat::utc('now - 1 month'), DateTimeFormat::utc('now - 1 week')]); DateTimeFormat::utc('now - 1 month'), DateTimeFormat::utc('now - 1 week')]);
$ids = self::getContactsToUpdate($condition, $ids, $limit); $ids = self::getContactsToUpdate($condition, $limit, $ids);
Logger::info('Fetched interacting federated contacts', ['count' => count($ids), 'condition' => $contact_condition]); Logger::info('Fetched interacting federated contacts', ['count' => count($ids), 'condition' => $contact_condition]);
} }
@ -80,7 +80,7 @@ class UpdateContacts
["(`last-update` < ? OR (NOT `failed` AND `last-update` < ?))", ["(`last-update` < ? OR (NOT `failed` AND `last-update` < ?))",
DateTimeFormat::utc('now - 6 month'), DateTimeFormat::utc('now - 1 month')]); DateTimeFormat::utc('now - 6 month'), DateTimeFormat::utc('now - 1 month')]);
$previous = count($ids); $previous = count($ids);
$ids = self::getContactsToUpdate($condition, $ids, $limit - $previous); $ids = self::getContactsToUpdate($condition, $limit - $previous, $ids);
Logger::info('Fetched federated contacts', ['count' => count($ids) - $previous]); Logger::info('Fetched federated contacts', ['count' => count($ids) - $previous]);
} }
@ -98,10 +98,11 @@ class UpdateContacts
* Returns contact ids based on a given condition * Returns contact ids based on a given condition
* *
* @param array $condition * @param array $condition
* @param int $limit
* @param array $ids * @param array $ids
* @return array contact ids * @return array contact ids
*/ */
private static function getContactsToUpdate(array $condition, array $ids = [], int $limit) private static function getContactsToUpdate(array $condition, int $limit, array $ids = [])
{ {
$contacts = DBA::select('contact', ['id'], $condition, ['limit' => $limit]); $contacts = DBA::select('contact', ['id'], $condition, ['limit' => $limit]);
while ($contact = DBA::fetch($contacts)) { while ($contact = DBA::fetch($contacts)) {