Replace Logger with DI::logger() in Model Contact classes

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index a0e186b40ed4c38c627395293bb352da5421b932..083f66287fe839df8bb05b9abe965fdda45f48f2 100644 (file)
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -15,7 +15,6 @@ use Friendica\Content\Conversation as ConversationContent;
 use Friendica\Content\Pager;
 use Friendica\Content\Text\HTML;
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
 use Friendica\Core\System;
@@ -182,7 +181,7 @@ class Contact
                $contact = DBA::selectFirst('contact', [], ['id' => DBA::lastInsertId()]);
                if (!DBA::isResult($contact)) {
                        // Shouldn't happen
-                       Logger::warning('Created contact could not be found', ['fields' => $fields]);
+                       DI::logger()->warning('Created contact could not be found', ['fields' => $fields]);
                        return 0;
                }
 
@@ -190,23 +189,23 @@ class Contact
                DBA::insert('account-user', $fields, Database::INSERT_IGNORE);
                $account_user = DBA::selectFirst('account-user', ['id'], ['uid' => $contact['uid'], 'uri-id' => $contact['uri-id']]);
                if (empty($account_user['id'])) {
-                       Logger::warning('Account-user entry not found', ['cid' => $contact['id'], 'uid' => $contact['uid'], 'uri-id' => $contact['uri-id'], 'url' => $contact['url']]);
+                       DI::logger()->warning('Account-user entry not found', ['cid' => $contact['id'], 'uid' => $contact['uid'], 'uri-id' => $contact['uri-id'], 'url' => $contact['url']]);
                } elseif ($account_user['id'] != $contact['id']) {
                        $duplicate = DBA::selectFirst('contact', [], ['id' => $account_user['id'], 'deleted' => false]);
                        if (!empty($duplicate['id'])) {
                                $ret = Contact::deleteById($contact['id']);
-                               Logger::notice('Deleted duplicated contact', ['ret' => $ret, 'account-user' => $account_user, 'cid' => $duplicate['id'], 'uid' => $duplicate['uid'], 'uri-id' => $duplicate['uri-id'], 'url' => $duplicate['url']]);
+                               DI::logger()->notice('Deleted duplicated contact', ['ret' => $ret, 'account-user' => $account_user, 'cid' => $duplicate['id'], 'uid' => $duplicate['uid'], 'uri-id' => $duplicate['uri-id'], 'url' => $duplicate['url']]);
                                $contact = $duplicate;
                        } else {
                                $ret = DBA::update('account-user', ['id' => $contact['id']], ['uid' => $contact['uid'], 'uri-id' => $contact['uri-id']]);
-                               Logger::notice('Updated account-user', ['ret' => $ret, 'account-user' => $account_user, 'cid' => $contact['id'], 'uid' => $contact['uid'], 'uri-id' => $contact['uri-id'], 'url' => $contact['url']]);
+                               DI::logger()->notice('Updated account-user', ['ret' => $ret, 'account-user' => $account_user, 'cid' => $contact['id'], 'uid' => $contact['uid'], 'uri-id' => $contact['uri-id'], 'url' => $contact['url']]);
                        }
                }
 
                Contact\User::insertForContactArray($contact);
 
                if ((empty($contact['baseurl']) || empty($contact['gsid'])) && Probe::isProbable($contact['network'])) {
-                       Logger::debug('Update missing baseurl', ['id' => $contact['id'], 'url' => $contact['url'], 'callstack' => System::callstack(4, 0, true)]);
+                       DI::logger()->debug('Update missing baseurl', ['id' => $contact['id'], 'url' => $contact['url'], 'callstack' => System::callstack(4, 0, true)]);
                        UpdateContact::add(['priority' => Worker::PRIORITY_MEDIUM, 'dont_fork' => true], $contact['id']);
                }
 
@@ -221,7 +220,7 @@ class Contact
         */
        public static function deleteById(int $id): bool
        {
-               Logger::debug('Delete contact', ['id' => $id]);
+               DI::logger()->debug('Delete contact', ['id' => $id]);
                DBA::delete('account-user', ['id' => $id]);
                return DBA::delete('contact', ['id' => $id]);
        }
@@ -370,7 +369,7 @@ class Contact
                        try {
                                UpdateContact::add(['priority' => Worker::PRIORITY_LOW, 'dont_fork' => true], $contact['id']);
                        } catch (\InvalidArgumentException $e) {
-                               Logger::notice($e->getMessage(), ['contact' => $contact]);
+                               DI::logger()->notice($e->getMessage(), ['contact' => $contact]);
                        }
                }
 
@@ -567,11 +566,11 @@ class Contact
                // And fetch the result
                $contact = DBA::selectFirst('contact', ['baseurl'], ['id' => $contact['id']]);
                if (empty($contact['baseurl'])) {
-                       Logger::info('No baseurl for contact', ['url' => $url]);
+                       DI::logger()->info('No baseurl for contact', ['url' => $url]);
                        return '';
                }
 
-               Logger::info('Found baseurl for contact', ['url' => $url, 'baseurl' => $contact['baseurl']]);
+               DI::logger()->info('Found baseurl for contact', ['url' => $url, 'baseurl' => $contact['baseurl']]);
                return $contact['baseurl'];
        }
 
@@ -1090,10 +1089,10 @@ class Contact
                                return;
                        }
                } elseif (!isset($contact['url']) || !isset($contact['uri-id'])) {
-                       Logger::info('Empty contact', ['contact' => $contact]);
+                       DI::logger()->info('Empty contact', ['contact' => $contact]);
                }
 
-               Logger::info('Contact is marked for archival', ['id' => $contact['id'], 'archive' => $contact['archive'], 'term-date' => $contact['term-date'], 'url' => $contact['url']]);
+               DI::logger()->info('Contact is marked for archival', ['id' => $contact['id'], 'archive' => $contact['archive'], 'term-date' => $contact['term-date'], 'url' => $contact['url']]);
 
                // Contact already archived or "self" contact? => nothing to do
                if ($contact['archive'] || $contact['self']) {
@@ -1157,7 +1156,7 @@ class Contact
                        }
                }
 
-               Logger::info('Contact is marked as vital again', ['id' => $contact['id'], 'term-date' => $contact['term-date'], 'url' => $contact['url']]);
+               DI::logger()->info('Contact is marked as vital again', ['id' => $contact['id'], 'term-date' => $contact['term-date'], 'url' => $contact['url']]);
 
                // It's a miracle. Our dead contact has inexplicably come back to life.
                $fields = ['failed' => false, 'term-date' => DBA::NULL_DATETIME, 'archive' => false];
@@ -1310,7 +1309,7 @@ class Contact
                $contact_id = 0;
 
                if (empty($url)) {
-                       Logger::notice('Empty url, quitting', ['url' => $url, 'user' => $uid, 'default' => $default]);
+                       DI::logger()->notice('Empty url, quitting', ['url' => $url, 'user' => $uid, 'default' => $default]);
                        return 0;
                }
 
@@ -1325,19 +1324,19 @@ class Contact
                                try {
                                        UpdateContact::add(['priority' => Worker::PRIORITY_LOW, 'dont_fork' => true], $contact['id']);
                                } catch (\InvalidArgumentException $e) {
-                                       Logger::notice($e->getMessage(), ['contact' => $contact]);
+                                       DI::logger()->notice($e->getMessage(), ['contact' => $contact]);
                                }
                        }
 
                        if (empty($update) && (!empty($contact['uri-id']) || is_bool($update))) {
-                               Logger::debug('Contact found', ['url' => $url, 'uid' => $uid, 'update' => $update, 'cid' => $contact_id]);
+                               DI::logger()->debug('Contact found', ['url' => $url, 'uid' => $uid, 'update' => $update, 'cid' => $contact_id]);
                                return $contact_id;
                        }
                } elseif ($uid != 0) {
-                       Logger::debug('Contact does not exist for the user', ['url' => $url, 'uid' => $uid, 'update' => $update]);
+                       DI::logger()->debug('Contact does not exist for the user', ['url' => $url, 'uid' => $uid, 'update' => $update]);
                        return 0;
                } elseif (empty($default) && !is_null($update) && !$update) {
-                       Logger::info('Contact not found, update not desired', ['url' => $url, 'uid' => $uid, 'update' => $update]);
+                       DI::logger()->info('Contact not found, update not desired', ['url' => $url, 'uid' => $uid, 'update' => $update]);
                        return 0;
                }
 
@@ -1369,7 +1368,7 @@ class Contact
                        }
 
                        if (DBA::isResult($personal_contact) && !Probe::isProbable($personal_contact['network'])) {
-                               Logger::info('Take contact data from personal contact', ['url' => $url, 'update' => $update, 'contact' => $personal_contact]);
+                               DI::logger()->info('Take contact data from personal contact', ['url' => $url, 'update' => $update, 'contact' => $personal_contact]);
                                $data = $personal_contact;
                                $data['photo'] = $personal_contact['avatar'];
                                $data['account-type'] = $personal_contact['contact-type'];
@@ -1381,12 +1380,12 @@ class Contact
                }
 
                if (empty($data['network']) || ($data['network'] == Protocol::PHANTOM)) {
-                       Logger::notice('No valid network found', ['url' => $url, 'uid' => $uid, 'default' => $default, 'update' => $update]);
+                       DI::logger()->notice('No valid network found', ['url' => $url, 'uid' => $uid, 'default' => $default, 'update' => $update]);
                        return 0;
                }
 
                if (!$contact_id && !empty($data['account-type']) && $data['account-type'] == User::ACCOUNT_TYPE_DELETED) {
-                       Logger::info('Contact is a tombstone. It will not be inserted', ['url' => $url, 'uid' => $uid]);
+                       DI::logger()->info('Contact is a tombstone. It will not be inserted', ['url' => $url, 'uid' => $uid]);
                        return 0;
                }
 
@@ -1398,7 +1397,7 @@ class Contact
                        $contact = self::selectFirst(['id'], ['nurl' => $urls, 'uid' => $uid]);
                        if (!empty($contact['id'])) {
                                $contact_id = $contact['id'];
-                               Logger::info('Fetched id by url', ['cid' => $contact_id, 'uid' => $uid, 'url' => $url, 'data' => $data]);
+                               DI::logger()->info('Fetched id by url', ['cid' => $contact_id, 'uid' => $uid, 'url' => $url, 'data' => $data]);
                        }
                }
 
@@ -1424,37 +1423,37 @@ class Contact
                        $contact = DBA::selectFirst('contact', ['id'], $condition, ['order' => ['id']]);
                        if (DBA::isResult($contact)) {
                                $contact_id = $contact['id'];
-                               Logger::notice('Contact had been created (shortly) before', ['id' => $contact_id, 'url' => $url, 'uid' => $uid]);
+                               DI::logger()->notice('Contact had been created (shortly) before', ['id' => $contact_id, 'url' => $url, 'uid' => $uid]);
                        } else {
                                $contact_id = self::insert($fields);
                                if ($contact_id) {
-                                       Logger::info('Contact inserted', ['id' => $contact_id, 'url' => $url, 'uid' => $uid]);
+                                       DI::logger()->info('Contact inserted', ['id' => $contact_id, 'url' => $url, 'uid' => $uid]);
                                }
                        }
 
                        if (!$contact_id) {
-                               Logger::warning('Contact was not inserted', ['url' => $url, 'uid' => $uid]);
+                               DI::logger()->warning('Contact was not inserted', ['url' => $url, 'uid' => $uid]);
                                return 0;
                        }
                } else {
-                       Logger::info('Contact will be updated', ['url' => $url, 'uid' => $uid, 'update' => $update, 'cid' => $contact_id]);
+                       DI::logger()->info('Contact will be updated', ['url' => $url, 'uid' => $uid, 'update' => $update, 'cid' => $contact_id]);
                }
 
                if ($data['network'] == Protocol::DIASPORA) {
                        try {
                                DI::dsprContact()->updateFromProbeArray($data);
                        } catch (NotFoundException $e) {
-                               Logger::notice($e->getMessage(), ['url' => $url, 'data' => $data]);
+                               DI::logger()->notice($e->getMessage(), ['url' => $url, 'data' => $data]);
                        } catch (\InvalidArgumentException $e) {
-                               Logger::notice($e->getMessage(), ['url' => $url, 'data' => $data]);
+                               DI::logger()->notice($e->getMessage(), ['url' => $url, 'data' => $data]);
                        }
                } elseif (!empty($data['networks'][Protocol::DIASPORA])) {
                        try {
                                DI::dsprContact()->updateFromProbeArray($data['networks'][Protocol::DIASPORA]);
                        } catch (NotFoundException $e) {
-                               Logger::notice($e->getMessage(), ['url' => $url, 'data' => $data['networks'][Protocol::DIASPORA]]);
+                               DI::logger()->notice($e->getMessage(), ['url' => $url, 'data' => $data['networks'][Protocol::DIASPORA]]);
                        } catch (\InvalidArgumentException $e) {
-                               Logger::notice($e->getMessage(), ['url' => $url, 'data' => $data['networks'][Protocol::DIASPORA]]);
+                               DI::logger()->notice($e->getMessage(), ['url' => $url, 'data' => $data['networks'][Protocol::DIASPORA]]);
                        }
                }
 
@@ -1463,7 +1462,7 @@ class Contact
 
                // Don't return a number for a deleted account
                if (!empty($data['account-type']) && $data['account-type'] == User::ACCOUNT_TYPE_DELETED) {
-                       Logger::info('Contact is a tombstone', ['url' => $url, 'uid' => $uid]);
+                       DI::logger()->info('Contact is a tombstone', ['url' => $url, 'uid' => $uid]);
                        return 0;
                }
 
@@ -1812,16 +1811,16 @@ class Contact
 
                if (in_array($contact['network'], [Protocol::FEED, Protocol::MAIL]) || DI::config()->get('system', 'cache_contact_avatar')) {
                        if (!empty($contact['avatar']) && (empty($contact['photo']) || empty($contact['thumb']) || empty($contact['micro']))) {
-                               Logger::info('Adding avatar cache', ['id' => $cid, 'contact' => $contact]);
+                               DI::logger()->info('Adding avatar cache', ['id' => $cid, 'contact' => $contact]);
                                self::updateAvatar($cid, $contact['avatar'], true);
                                return;
                        }
                } elseif (Photo::isPhotoURI($contact['photo']) || Photo::isPhotoURI($contact['thumb']) || Photo::isPhotoURI($contact['micro'])) {
-                       Logger::info('Replacing legacy avatar cache', ['id' => $cid, 'contact' => $contact]);
+                       DI::logger()->info('Replacing legacy avatar cache', ['id' => $cid, 'contact' => $contact]);
                        self::updateAvatar($cid, $contact['avatar'], true);
                        return;
                } elseif (DI::config()->get('system', 'avatar_cache') && (empty($contact['photo']) || empty($contact['thumb']) || empty($contact['micro']))) {
-                       Logger::info('Adding avatar cache file', ['id' => $cid, 'contact' => $contact]);
+                       DI::logger()->info('Adding avatar cache file', ['id' => $cid, 'contact' => $contact]);
                        self::updateAvatar($cid, $contact['avatar'], true);
                        return;
                }
@@ -2303,7 +2302,7 @@ class Contact
                }
 
                if (!empty($avatar) && !Network::isValidHttpUrl($avatar)) {
-                       Logger::warning('Invalid avatar', ['cid' => $cid, 'avatar' => $avatar]);
+                       DI::logger()->warning('Invalid avatar', ['cid' => $cid, 'avatar' => $avatar]);
                        $avatar = '';
                }
 
@@ -2327,7 +2326,7 @@ class Contact
                                                        }
                                                }
                                        } catch (\Exception $exception) {
-                                               Logger::notice('Error fetching avatar', ['avatar' => $avatar, 'exception' => $exception]);
+                                               DI::logger()->notice('Error fetching avatar', ['avatar' => $avatar, 'exception' => $exception]);
                                                return;
                                        }
                                } elseif (!empty($contact['blurhash'])) {
@@ -2337,7 +2336,7 @@ class Contact
                                }
 
                                self::update($update_fields, ['id' => $cid]);
-                               Logger::info('Only update the avatar', ['id' => $cid, 'avatar' => $avatar, 'contact' => $contact]);
+                               DI::logger()->info('Only update the avatar', ['id' => $cid, 'avatar' => $avatar, 'contact' => $contact]);
                        }
                        return;
                }
@@ -2346,7 +2345,7 @@ class Contact
                if (($uid != 0) && !in_array($contact['network'], [Protocol::FEED, Protocol::MAIL])) {
                        $pcid = self::getIdForURL($contact['url'], 0, false);
                        if (!empty($pcid)) {
-                               Logger::debug('Update the private contact via the public contact', ['id' => $cid, 'uid' => $uid, 'public' => $pcid]);
+                               DI::logger()->debug('Update the private contact via the public contact', ['id' => $cid, 'uid' => $uid, 'public' => $pcid]);
                                self::updateAvatar($pcid, $avatar, $force, true);
                                return;
                        }
@@ -2380,7 +2379,7 @@ class Contact
                                        'thumb' => self::getDefaultAvatar($contact, Proxy::SIZE_THUMB),
                                        'micro' => self::getDefaultAvatar($contact, Proxy::SIZE_MICRO)
                                ];
-                               Logger::debug('Use default avatar', ['id' => $cid, 'uid' => $uid]);
+                               DI::logger()->debug('Use default avatar', ['id' => $cid, 'uid' => $uid]);
                        }
 
                        $local_uid = 0;
@@ -2390,7 +2389,7 @@ class Contact
                                $local_uid = User::getIdForURL($contact['url']);
                                if (!empty($local_uid)) {
                                        $fields = self::selectFirst(['avatar', 'avatar-date', 'photo', 'thumb', 'micro'], ['self' => true, 'uid' => $local_uid]);
-                                       Logger::debug('Use owner data', ['id' => $cid, 'uid' => $uid, 'owner-uid' => $local_uid]);
+                                       DI::logger()->debug('Use owner data', ['id' => $cid, 'uid' => $uid, 'owner-uid' => $local_uid]);
                                }
                        }
 
@@ -2407,7 +2406,7 @@ class Contact
                                        foreach ($data as $image_uri) {
                                                $image_rid = Photo::ridFromURI($image_uri);
                                                if ($image_rid && !Photo::exists(['resource-id' => $image_rid, 'uid' => $uid])) {
-                                                       Logger::debug('Regenerating avatar', ['contact uid' => $uid, 'cid' => $cid, 'missing photo' => $image_rid, 'avatar' => $contact['avatar']]);
+                                                       DI::logger()->debug('Regenerating avatar', ['contact uid' => $uid, 'cid' => $cid, 'missing photo' => $image_rid, 'avatar' => $contact['avatar']]);
                                                        $update = true;
                                                }
                                        }
@@ -2425,7 +2424,7 @@ class Contact
                                                        'avatar-date' => DateTimeFormat::utcNow(),
                                                ];
                                                $update = true;
-                                               Logger::debug('Created new cached avatars', ['id' => $cid, 'uid' => $uid, 'owner-uid' => $local_uid]);
+                                               DI::logger()->debug('Created new cached avatars', ['id' => $cid, 'uid' => $uid, 'owner-uid' => $local_uid]);
                                        } else {
                                                $update = false;
                                        }
@@ -2466,7 +2465,7 @@ class Contact
 
                $cids[] = $cid;
                $uids[] = $uid;
-               Logger::info('Updating cached contact avatars', ['cid' => $cids, 'uid' => $uids, 'fields' => $fields]);
+               DI::logger()->info('Updating cached contact avatars', ['cid' => $cids, 'uid' => $uids, 'fields' => $fields]);
                self::update($fields, ['id' => $cids]);
        }
 
@@ -2476,7 +2475,7 @@ class Contact
                $condition = ['self' => false, 'nurl' => Strings::normaliseLink($url)];
                $contacts = DBA::select('contact', ['id', 'uid'], $condition);
                while ($contact = DBA::fetch($contacts)) {
-                       Logger::info('Deleting contact', ['id' => $contact['id'], 'uid' => $contact['uid'], 'url' => $url]);
+                       DI::logger()->info('Deleting contact', ['id' => $contact['id'], 'uid' => $contact['uid'], 'url' => $url]);
                        self::remove($contact['id']);
                }
        }
@@ -2508,7 +2507,7 @@ class Contact
        private static function updateContact(int $id, int $uid, int $uri_id, string $url, array $fields)
        {
                if (!self::update($fields, ['id' => $id])) {
-                       Logger::info('Couldn\'t update contact.', ['id' => $id, 'fields' => $fields]);
+                       DI::logger()->info('Couldn\'t update contact.', ['id' => $id, 'fields' => $fields]);
                        return;
                }
 
@@ -2517,7 +2516,7 @@ class Contact
                // Archive or unarchive the contact.
                $contact = DBA::selectFirst('contact', [], ['id' => $id]);
                if (!DBA::isResult($contact)) {
-                       Logger::info('Couldn\'t select contact for archival.', ['id' => $id]);
+                       DI::logger()->info('Couldn\'t select contact for archival.', ['id' => $id]);
                        return;
                }
 
@@ -2564,29 +2563,29 @@ class Contact
                if (!empty($account_user['uri-id']) && ($account_user['uri-id'] != $uri_id)) {
                        if ($account_user['uid'] == $uid) {
                                $ret = DBA::update('account-user', ['uri-id' => $uri_id], ['id' => $id]);
-                               Logger::notice('Updated account-user uri-id', ['ret' => $ret, 'account-user' => $account_user, 'cid' => $id, 'uid' => $uid, 'uri-id' => $uri_id, 'url' => $url]);
+                               DI::logger()->notice('Updated account-user uri-id', ['ret' => $ret, 'account-user' => $account_user, 'cid' => $id, 'uid' => $uid, 'uri-id' => $uri_id, 'url' => $url]);
                        } else {
                                // This should never happen
-                               Logger::warning('account-user exists for a different uri-id and uid', ['account_user' => $account_user, 'id' => $id, 'uid' => $uid, 'uri-id' => $uri_id, 'url' => $url]);
+                               DI::logger()->warning('account-user exists for a different uri-id and uid', ['account_user' => $account_user, 'id' => $id, 'uid' => $uid, 'uri-id' => $uri_id, 'url' => $url]);
                        }
                }
 
                $account_user = DBA::selectFirst('account-user', ['id', 'uid', 'uri-id'], ['uid' => $uid, 'uri-id' => $uri_id]);
                if (!empty($account_user['id'])) {
                        if ($account_user['id'] == $id) {
-                               Logger::debug('account-user already exists', ['id' => $id, 'uid' => $uid, 'uri-id' => $uri_id, 'url' => $url]);
+                               DI::logger()->debug('account-user already exists', ['id' => $id, 'uid' => $uid, 'uri-id' => $uri_id, 'url' => $url]);
                                return;
                        } elseif (!DBA::exists('contact', ['id' => $account_user['id'], 'deleted' => false])) {
                                $ret = DBA::update('account-user', ['id' => $id], ['uid' => $uid, 'uri-id' => $uri_id]);
-                               Logger::notice('Updated account-user', ['ret' => $ret, 'account-user' => $account_user, 'cid' => $id, 'uid' => $uid, 'uri-id' => $uri_id, 'url' => $url]);
+                               DI::logger()->notice('Updated account-user', ['ret' => $ret, 'account-user' => $account_user, 'cid' => $id, 'uid' => $uid, 'uri-id' => $uri_id, 'url' => $url]);
                                return;
                        }
-                       Logger::warning('account-user exists for a different contact id', ['account_user' => $account_user, 'id' => $id, 'uid' => $uid, 'uri-id' => $uri_id, 'url' => $url]);
+                       DI::logger()->warning('account-user exists for a different contact id', ['account_user' => $account_user, 'id' => $id, 'uid' => $uid, 'uri-id' => $uri_id, 'url' => $url]);
                        Worker::add(Worker::PRIORITY_HIGH, 'MergeContact', $account_user['id'], $id, $uid);
                } elseif (DBA::insert('account-user', ['id' => $id, 'uri-id' => $uri_id, 'uid' => $uid], Database::INSERT_IGNORE)) {
-                       Logger::notice('account-user was added', ['id' => $id, 'uid' => $uid, 'uri-id' => $uri_id, 'url' => $url]);
+                       DI::logger()->notice('account-user was added', ['id' => $id, 'uid' => $uid, 'uri-id' => $uri_id, 'url' => $url]);
                } else {
-                       Logger::warning('account-user was not added', ['id' => $id, 'uid' => $uid, 'uri-id' => $uri_id, 'url' => $url]);
+                       DI::logger()->warning('account-user was not added', ['id' => $id, 'uid' => $uid, 'uri-id' => $uri_id, 'url' => $url]);
                }
        }
 
@@ -2613,7 +2612,7 @@ class Contact
                }
 
                $first = $first_contact['id'];
-               Logger::info('Found duplicates', ['count' => $count, 'first' => $first, 'uid' => $uid, 'nurl' => $nurl]);
+               DI::logger()->info('Found duplicates', ['count' => $count, 'first' => $first, 'uid' => $uid, 'nurl' => $nurl]);
 
                // Find all duplicates
                $condition = ["`nurl` = ? AND `uid` = ? AND `id` != ? AND NOT `self` AND NOT `deleted`", $nurl, $uid, $first];
@@ -2626,7 +2625,7 @@ class Contact
                        Worker::add(Worker::PRIORITY_HIGH, 'MergeContact', $first, $duplicate['id'], $uid);
                }
                DBA::close($duplicates);
-               Logger::info('Duplicates handled', ['uid' => $uid, 'nurl' => $nurl]);
+               DI::logger()->info('Duplicates handled', ['uid' => $uid, 'nurl' => $nurl]);
                return true;
        }
 
@@ -2649,7 +2648,7 @@ class Contact
 
                $stamp = (float)microtime(true);
                self::updateFromProbe($id);
-               Logger::debug('Contact data is updated.', ['duration' => round((float)microtime(true) - $stamp, 3), 'id' => $id, 'url' => $contact['url']]);
+               DI::logger()->debug('Contact data is updated.', ['duration' => round((float)microtime(true) - $stamp, 3), 'id' => $id, 'url' => $contact['url']]);
                return true;
        }
 
@@ -2698,17 +2697,17 @@ class Contact
                        try {
                                DI::dsprContact()->updateFromProbeArray($data);
                        } catch (NotFoundException $e) {
-                               Logger::notice($e->getMessage(), ['id' => $id, 'network' => $network, 'contact' => $contact, 'data' => $data]);
+                               DI::logger()->notice($e->getMessage(), ['id' => $id, 'network' => $network, 'contact' => $contact, 'data' => $data]);
                        } catch (\InvalidArgumentException $e) {
-                               Logger::notice($e->getMessage(), ['id' => $id, 'network' => $network, 'contact' => $contact, 'data' => $data]);
+                               DI::logger()->notice($e->getMessage(), ['id' => $id, 'network' => $network, 'contact' => $contact, 'data' => $data]);
                        }
                } elseif (!empty($data['networks'][Protocol::DIASPORA])) {
                        try {
                                DI::dsprContact()->updateFromProbeArray($data['networks'][Protocol::DIASPORA]);
                        } catch (NotFoundException $e) {
-                               Logger::notice($e->getMessage(), ['id' => $id, 'network' => $network, 'contact' => $contact, 'data' => $data]);
+                               DI::logger()->notice($e->getMessage(), ['id' => $id, 'network' => $network, 'contact' => $contact, 'data' => $data]);
                        } catch (\InvalidArgumentException $e) {
-                               Logger::notice($e->getMessage(), ['id' => $id, 'network' => $network, 'contact' => $contact, 'data' => $data]);
+                               DI::logger()->notice($e->getMessage(), ['id' => $id, 'network' => $network, 'contact' => $contact, 'data' => $data]);
                        }
                }
 
@@ -2789,7 +2788,7 @@ class Contact
 
                if (self::isLocal($ret['url'])) {
                        if ($contact['uid'] == 0) {
-                               Logger::info('Local contacts are not updated here.');
+                               DI::logger()->info('Local contacts are not updated here.');
                        } else {
                                self::updateFromPublicContact($id, $contact);
                        }
@@ -2797,7 +2796,7 @@ class Contact
                }
 
                if (!empty($ret['account-type']) && $ret['account-type'] == User::ACCOUNT_TYPE_DELETED) {
-                       Logger::info('Deleted account', ['id' => $id, 'url' => $ret['url'], 'ret' => $ret]);
+                       DI::logger()->info('Deleted account', ['id' => $id, 'url' => $ret['url'], 'ret' => $ret]);
                        self::remove($id);
 
                        // Delete all contacts with the same URL
@@ -2844,7 +2843,7 @@ class Contact
                }
 
                if (Strings::normaliseLink($contact['url']) != Strings::normaliseLink($ret['url'])) {
-                       Logger::notice('New URL differs from old URL', ['id' => $id, 'uid' => $uid, 'old' => $contact['url'], 'new' => $ret['url']]);
+                       DI::logger()->notice('New URL differs from old URL', ['id' => $id, 'uid' => $uid, 'old' => $contact['url'], 'new' => $ret['url']]);
                        self::updateContact($id, $uid, $uriid, $contact['url'], ['failed' => true, 'local-data' => $has_local_data, 'last-update' => $updated, 'next-update' => $failed_next_update, 'failure_update' => $updated]);
                        return false;
                }
@@ -2857,10 +2856,10 @@ class Contact
                ) {
                        if (GServer::reachable($contact)) {
                                self::updateContact($id, $uid, $uriid, $contact['url'], ['failed' => false, 'local-data' => $has_local_data, 'last-update' => $updated, 'next-update' => $success_next_update, 'success_update' => $updated, 'unsearchable' => true]);
-                               Logger::info('Not updating relay', ['id' => $id, 'url' => $contact['url']]);
+                               DI::logger()->info('Not updating relay', ['id' => $id, 'url' => $contact['url']]);
                                return true;
                        }
-                       Logger::info('Relay server is not reachable', ['id' => $id, 'url' => $contact['url']]);
+                       DI::logger()->info('Relay server is not reachable', ['id' => $id, 'url' => $contact['url']]);
                        self::updateContact($id, $uid, $uriid, $contact['url'], ['failed' => true, 'local-data' => $has_local_data, 'last-update' => $updated, 'next-update' => $failed_next_update, 'failure_update' => $updated, 'unsearchable' => true]);
                        return false;
                }
@@ -2874,7 +2873,7 @@ class Contact
                if (Strings::normaliseLink($ret['url']) != Strings::normaliseLink($contact['url'])) {
                        $cid = self::getIdForURL($ret['url'], 0, false);
                        if (!empty($cid) && ($cid != $id)) {
-                               Logger::notice('URL of contact changed.', ['id' => $id, 'new_id' => $cid, 'old' => $contact['url'], 'new' => $ret['url']]);
+                               DI::logger()->notice('URL of contact changed.', ['id' => $id, 'new_id' => $cid, 'old' => $contact['url'], 'new' => $ret['url']]);
                                return self::updateFromProbeArray($cid, $ret);
                        }
                }
@@ -2904,7 +2903,7 @@ class Contact
                        }
 
                        $ret['last-item'] = Probe::getLastUpdate($ret);
-                       Logger::info('Fetched last item', ['id' => $id, 'probed_url' => $ret['url'], 'last-item' => $ret['last-item']]);
+                       DI::logger()->info('Fetched last item', ['id' => $id, 'probed_url' => $ret['url'], 'last-item' => $ret['last-item']]);
                }
 
                $update = false;
@@ -3006,7 +3005,7 @@ class Contact
                }
                if (!empty($fields)) {
                        self::update($fields, ['id' => $id, 'self' => false]);
-                       Logger::info('Updating local contact', ['id' => $id]);
+                       DI::logger()->info('Updating local contact', ['id' => $id]);
                }
        }
 
@@ -3243,7 +3242,7 @@ class Contact
                        try {
                                UpdateContact::add(Worker::PRIORITY_HIGH, $contact['id']);
                        } catch (\InvalidArgumentException $e) {
-                               Logger::notice($e->getMessage(), ['contact' => $contact]);
+                               DI::logger()->notice($e->getMessage(), ['contact' => $contact]);
                        }
                }
 
@@ -3297,7 +3296,7 @@ class Contact
 
                if (!empty($contact)) {
                        if (!empty($contact['pending'])) {
-                               Logger::info('Pending contact request already exists.', ['url' => $url, 'uid' => $importer['uid']]);
+                               DI::logger()->info('Pending contact request already exists.', ['url' => $url, 'uid' => $importer['uid']]);
                                return null;
                        }
 
@@ -3330,7 +3329,7 @@ class Contact
                } else {
                        // send email notification to owner?
                        if (DBA::exists('contact', ['nurl' => Strings::normaliseLink($url), 'uid' => $importer['uid'], 'pending' => true])) {
-                               Logger::notice('ignoring duplicated connection request from pending contact ' . $url);
+                               DI::logger()->notice('ignoring duplicated connection request from pending contact ' . $url);
                                return null;
                        }
 
@@ -3492,7 +3491,7 @@ class Contact
                $contacts = DBA::select('contact', ['id', 'uid', 'name', 'url', 'bd'], $condition);
 
                while ($contact = DBA::fetch($contacts)) {
-                       Logger::notice('update_contact_birthday: ' . $contact['bd']);
+                       DI::logger()->notice('update_contact_birthday: ' . $contact['bd']);
 
                        $nextbd = DateTimeFormat::utcNow('Y') . substr($contact['bd'], 4);
 
@@ -3774,7 +3773,7 @@ class Contact
                                        UpdateContact::add(['priority' => Worker::PRIORITY_LOW, 'dont_fork' => true], $contact['id']);
                                        ++$updated;
                                } catch (\InvalidArgumentException $e) {
-                                       Logger::notice($e->getMessage(), ['contact' => $contact]);
+                                       DI::logger()->notice($e->getMessage(), ['contact' => $contact]);
                                }
                        } else {
                                ++$unchanged;

diff --git a/src/Model/Contact/Relation.php b/src/Model/Contact/Relation.php
index 036213045f29e010aa520fd8b10178534ffbf1e9..76e0a7ac63ca1759d6276766e01fb88068e0c842 100644 (file)
--- a/src/Model/Contact/Relation.php
+++ b/src/Model/Contact/Relation.php
@@ -9,7 +9,6 @@ namespace Friendica\Model\Contact;
 
 use Exception;
 use Friendica\Content\Widget;
-use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Database\Database;
 use Friendica\Database\DBA;
@@ -67,7 +66,7 @@ class Relation
        {
                $contact = Contact::selectFirst(['id', 'url', 'network'], ['id' => Contact::getPublicIdByUserId($uid)]);
                if (empty($contact)) {
-                       Logger::warning('Self contact for user not found', ['uid' => $uid]);
+                       DI::logger()->warning('Self contact for user not found', ['uid' => $uid]);
                        return;
                }
 
@@ -87,22 +86,22 @@ class Relation
        {
                $contact = Contact::getByURL($url);
                if (empty($contact)) {
-                       Logger::info('Contact not found', ['url' => $url]);
+                       DI::logger()->info('Contact not found', ['url' => $url]);
                        return;
                }
 
                if (!self::isDiscoverable($url, $contact)) {
-                       Logger::info('Contact is not discoverable', ['url' => $url]);
+                       DI::logger()->info('Contact is not discoverable', ['url' => $url]);
                        return;
                }
 
                $uid = User::getIdForURL($url);
                if (!empty($uid)) {
-                       Logger::info('Fetch the followers/followings locally', ['url' => $url]);
+                       DI::logger()->info('Fetch the followers/followings locally', ['url' => $url]);
                        $followers = self::getContacts($uid, [Contact::FOLLOWER, Contact::FRIEND]);
                        $followings = self::getContacts($uid, [Contact::SHARING, Contact::FRIEND]);
                } elseif (!Contact::isLocal($url)) {
-                       Logger::info('Fetch the followers/followings by polling the endpoints', ['url' => $url]);
+                       DI::logger()->info('Fetch the followers/followings by polling the endpoints', ['url' => $url]);
                        $apcontact = APContact::getByURL($url, false);
 
                        if (!empty($apcontact['followers']) && is_string($apcontact['followers'])) {
@@ -117,7 +116,7 @@ class Relation
                                $followings = [];
                        }
                } else {
-                       Logger::warning('Contact seems to be local but could not be found here', ['url' => $url]);
+                       DI::logger()->warning('Contact seems to be local but could not be found here', ['url' => $url]);
                        $followers = [];
                        $followings = [];
                }
@@ -137,7 +136,7 @@ class Relation
        {
                if (empty($followers) && empty($followings)) {
                        Contact::update(['last-discovery' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
-                       Logger::info('The contact does not offer discoverable data', ['id' => $contact['id'], 'url' => $contact['url'], 'network' => $contact['network']]);
+                       DI::logger()->info('The contact does not offer discoverable data', ['id' => $contact['id'], 'url' => $contact['url'], 'network' => $contact['network']]);
                        return;
                }
 
@@ -162,7 +161,7 @@ class Relation
                $follower_counter = 0;
                $following_counter = 0;
 
-               Logger::info('Discover contacts', ['id' => $target, 'url' => $url, 'contacts' => count($contacts)]);
+               DI::logger()->info('Discover contacts', ['id' => $target, 'url' => $url, 'contacts' => count($contacts)]);
                foreach ($contacts as $contact) {
                        $actor = Contact::getIdForURL($contact);
                        if (!empty($actor)) {
@@ -186,7 +185,7 @@ class Relation
                }
 
                Contact::update(['last-discovery' => DateTimeFormat::utcNow()], ['id' => $target]);
-               Logger::info('Contacts discovery finished', ['id' => $target, 'url' => $url, 'follower' => $follower_counter, 'following' => $following_counter]);
+               DI::logger()->info('Contacts discovery finished', ['id' => $target, 'url' => $url, 'follower' => $follower_counter, 'following' => $following_counter]);
                return;
        }
 
@@ -260,34 +259,34 @@ class Relation
                }
 
                if ($contact['last-discovery'] > DateTimeFormat::utc('now - 1 month')) {
-                       Logger::info('No discovery - Last was less than a month ago.', ['id' => $contact['id'], 'url' => $url, 'discovery' => $contact['last-discovery']]);
+                       DI::logger()->info('No discovery - Last was less than a month ago.', ['id' => $contact['id'], 'url' => $url, 'discovery' => $contact['last-discovery']]);
                        return false;
                }
 
                if ($contact_discovery != self::DISCOVERY_ALL) {
                        $local = DBA::exists('contact', ["`nurl` = ? AND `uid` != ?", Strings::normaliseLink($url), 0]);
                        if (($contact_discovery == self::DISCOVERY_LOCAL) && !$local) {
-                               Logger::info('No discovery - This contact is not followed/following locally.', ['id' => $contact['id'], 'url' => $url]);
+                               DI::logger()->info('No discovery - This contact is not followed/following locally.', ['id' => $contact['id'], 'url' => $url]);
                                return false;
                        }
 
                        if ($contact_discovery == self::DISCOVERY_INTERACTOR) {
                                $interactor = DBA::exists('contact-relation', ["`relation-cid` = ? AND `last-interaction` > ?", $contact['id'], DBA::NULL_DATETIME]);
                                if (!$local && !$interactor) {
-                                       Logger::info('No discovery - This contact is not interacting locally.', ['id' => $contact['id'], 'url' => $url]);
+                                       DI::logger()->info('No discovery - This contact is not interacting locally.', ['id' => $contact['id'], 'url' => $url]);
                                        return false;
                                }
                        }
                } elseif ($contact['created'] > DateTimeFormat::utc('now - 1 day')) {
                        // Newly created contacts are not discovered to avoid DDoS attacks
-                       Logger::info('No discovery - Contact record is less than a day old.', ['id' => $contact['id'], 'url' => $url, 'discovery' => $contact['created']]);
+                       DI::logger()->info('No discovery - Contact record is less than a day old.', ['id' => $contact['id'], 'url' => $url, 'discovery' => $contact['created']]);
                        return false;
                }
 
                if (!in_array($contact['network'], [Protocol::ACTIVITYPUB, Protocol::DFRN])) {
                        $apcontact = APContact::getByURL($url, false);
                        if (empty($apcontact)) {
-                               Logger::info('No discovery - The contact does not seem to speak ActivityPub.', ['id' => $contact['id'], 'url' => $url, 'network' => $contact['network']]);
+                               DI::logger()->info('No discovery - The contact does not seem to speak ActivityPub.', ['id' => $contact['id'], 'url' => $url, 'network' => $contact['network']]);
                                return false;
                        }
                }
@@ -366,7 +365,7 @@ class Relation
                $totallimit = $start + $limit;
                $contacts = [];
 
-               Logger::info('Collecting suggestions', ['uid' => $uid, 'cid' => $cid, 'start' => $start, 'limit' => $limit]);
+               DI::logger()->info('Collecting suggestions', ['uid' => $uid, 'cid' => $cid, 'start' => $start, 'limit' => $limit]);
 
                $diaspora = DI::config()->get('system', 'diaspora_enabled') ? Protocol::DIASPORA : Protocol::ACTIVITYPUB;
 
@@ -394,7 +393,7 @@ class Relation
 
                DBA::close($results);
 
-               Logger::info('Contacts of contacts who are followed by the given user', ['uid' => $uid, 'cid' => $cid, 'count' => count($contacts)]);
+               DI::logger()->info('Contacts of contacts who are followed by the given user', ['uid' => $uid, 'cid' => $cid, 'count' => count($contacts)]);
 
                if (count($contacts) >= $totallimit) {
                        return array_slice($contacts, $start, $limit);
@@ -419,7 +418,7 @@ class Relation
                }
                DBA::close($results);
 
-               Logger::info('Contacts of contacts who are following the given user', ['uid' => $uid, 'cid' => $cid, 'count' => count($contacts)]);
+               DI::logger()->info('Contacts of contacts who are following the given user', ['uid' => $uid, 'cid' => $cid, 'count' => count($contacts)]);
 
                if (count($contacts) >= $totallimit) {
                        return array_slice($contacts, $start, $limit);
@@ -440,7 +439,7 @@ class Relation
                }
                DBA::close($results);
 
-               Logger::info('Followers that are not followed by the given user', ['uid' => $uid, 'cid' => $cid, 'count' => count($contacts)]);
+               DI::logger()->info('Followers that are not followed by the given user', ['uid' => $uid, 'cid' => $cid, 'count' => count($contacts)]);
 
                if (count($contacts) >= $totallimit) {
                        return array_slice($contacts, $start, $limit);
@@ -461,7 +460,7 @@ class Relation
                }
                DBA::close($results);
 
-               Logger::info('Any contact', ['uid' => $uid, 'cid' => $cid, 'count' => count($contacts)]);
+               DI::logger()->info('Any contact', ['uid' => $uid, 'cid' => $cid, 'count' => count($contacts)]);
 
                return array_slice($contacts, $start, $limit);
        }
@@ -714,7 +713,7 @@ class Relation
        public static function countCommonFollows(int $sourceId, int $targetId, array $condition = []): int
        {
                $condition = DBA::mergeConditions($condition,
-                       ['`id` IN (SELECT `relation-cid` FROM `contact-relation` WHERE `cid` = ? AND `follows`) 
+                       ['`id` IN (SELECT `relation-cid` FROM `contact-relation` WHERE `cid` = ? AND `follows`)
                        AND `id` IN (SELECT `relation-cid` FROM `contact-relation` WHERE `cid` = ? AND `follows`)',
                        $sourceId, $targetId]
                );
@@ -737,7 +736,7 @@ class Relation
        public static function listCommonFollows(int $sourceId, int $targetId, array $condition = [], int $count = 30, int $offset = 0, bool $shuffle = false)
        {
                $condition = DBA::mergeConditions($condition,
-                       ["`id` IN (SELECT `relation-cid` FROM `contact-relation` WHERE `cid` = ? AND `follows`) 
+                       ["`id` IN (SELECT `relation-cid` FROM `contact-relation` WHERE `cid` = ? AND `follows`)
                        AND `id` IN (SELECT `relation-cid` FROM `contact-relation` WHERE `cid` = ? AND `follows`)",
                        $sourceId, $targetId]
                );
@@ -759,7 +758,7 @@ class Relation
        public static function countCommonFollowers(int $sourceId, int $targetId, array $condition = []): int
        {
                $condition = DBA::mergeConditions($condition,
-                       ["`id` IN (SELECT `cid` FROM `contact-relation` WHERE `relation-cid` = ? AND `follows`) 
+                       ["`id` IN (SELECT `cid` FROM `contact-relation` WHERE `relation-cid` = ? AND `follows`)
                        AND `id` IN (SELECT `cid` FROM `contact-relation` WHERE `relation-cid` = ? AND `follows`)",
                        $sourceId, $targetId]
                );
@@ -782,7 +781,7 @@ class Relation
        public static function listCommonFollowers(int $sourceId, int $targetId, array $condition = [], int $count = 30, int $offset = 0, bool $shuffle = false)
        {
                $condition = DBA::mergeConditions($condition,
-                       ["`id` IN (SELECT `cid` FROM `contact-relation` WHERE `relation-cid` = ? AND `follows`) 
+                       ["`id` IN (SELECT `cid` FROM `contact-relation` WHERE `relation-cid` = ? AND `follows`)
                        AND `id` IN (SELECT `cid` FROM `contact-relation` WHERE `relation-cid` = ? AND `follows`)",
                        $sourceId, $targetId]
                );
@@ -803,7 +802,7 @@ class Relation
                $days = DI::config()->get('channel', 'interaction_score_days');
                $contact_id = Contact::getPublicIdByUserId($uid);
 
-               Logger::debug('Calculation - start', ['uid' => $uid, 'cid' => $contact_id, 'days' => $days]);
+               DI::logger()->debug('Calculation - start', ['uid' => $uid, 'cid' => $contact_id, 'days' => $days]);
 
                $follow = Verb::getID(Activity::FOLLOW);
                $view = Verb::getID(Activity::VIEW);
@@ -814,7 +813,7 @@ class Relation
                $total = DBA::fetchFirst("SELECT count(*) AS `activity` FROM `post-user` INNER JOIN `post` ON `post`.`uri-id` = `post-user`.`thr-parent-id` WHERE `post-user`.`author-id` = ? AND `post-user`.`received` >= ? AND `post-user`.`uid` = ? AND `post`.`author-id` != ? AND NOT `post`.`vid` IN (?, ?, ?)",
                        $contact_id, DateTimeFormat::utc('now - ' . $days . ' day'), $uid, $contact_id, $follow, $view, $read);
 
-               Logger::debug('Calculate relation-score', ['uid' => $uid, 'total' => $total['activity']]);
+               DI::logger()->debug('Calculate relation-score', ['uid' => $uid, 'total' => $total['activity']]);
 
                $interactions = DBA::p("SELECT `post`.`author-id`, count(*) AS `activity`, EXISTS(SELECT `pid` FROM `account-user-view` WHERE `pid` = `post`.`author-id` AND `uid` = ? AND `rel` IN (?, ?)) AS `follows`
                        FROM `post-user` INNER JOIN `post` ON `post`.`uri-id` = `post-user`.`thr-parent-id` WHERE `post-user`.`author-id` = ? AND `post-user`.`received` >= ? AND `post-user`.`uid` = ? AND `post`.`author-id` != ? AND NOT `post`.`vid` IN (?, ?, ?) GROUP BY `post`.`author-id`",
@@ -828,7 +827,7 @@ class Relation
                $total = DBA::fetchFirst("SELECT count(*) AS `activity` FROM `post-user` INNER JOIN `post` ON `post`.`uri-id` = `post-user`.`parent-uri-id` WHERE `post-user`.`author-id` = ? AND `post-user`.`received` >= ? AND `post-user`.`uid` = ? AND `post`.`author-id` != ? AND NOT `post`.`vid` IN (?, ?, ?)",
                        $contact_id, DateTimeFormat::utc('now - ' . $days . ' day'), $uid, $contact_id, $follow, $view, $read);
 
-               Logger::debug('Calculate relation-thread-score', ['uid' => $uid, 'total' => $total['activity']]);
+               DI::logger()->debug('Calculate relation-thread-score', ['uid' => $uid, 'total' => $total['activity']]);
 
                $interactions = DBA::p("SELECT `post`.`author-id`, count(*) AS `activity`, EXISTS(SELECT `pid` FROM `account-user-view` WHERE `pid` = `post`.`author-id` AND `uid` = ? AND `rel` IN (?, ?)) AS `follows`
                        FROM `post-user` INNER JOIN `post` ON `post`.`uri-id` = `post-user`.`parent-uri-id` WHERE `post-user`.`author-id` = ? AND `post-user`.`received` >= ? AND `post-user`.`uid` = ? AND `post`.`author-id` != ? AND NOT `post`.`vid` IN (?, ?, ?) GROUP BY `post`.`author-id`",
@@ -842,7 +841,7 @@ class Relation
                $total = DBA::fetchFirst("SELECT count(*) AS `activity` FROM `post-user` INNER JOIN `post` ON `post-user`.`uri-id` = `post`.`thr-parent-id` WHERE `post-user`.`author-id` = ? AND `post-user`.`received` >= ? AND `post-user`.`uid` = ? AND `post`.`author-id` != ? AND NOT `post`.`vid` IN (?, ?, ?)",
                        $contact_id, DateTimeFormat::utc('now - ' . $days . ' day'), $uid, $contact_id, $follow, $view, $read);
 
-               Logger::debug('Calculate score', ['uid' => $uid, 'total' => $total['activity']]);
+               DI::logger()->debug('Calculate score', ['uid' => $uid, 'total' => $total['activity']]);
 
                $interactions = DBA::p("SELECT `post`.`author-id`, count(*) AS `activity` FROM `post-user` INNER JOIN `post` ON `post-user`.`uri-id` = `post`.`thr-parent-id` WHERE `post-user`.`author-id` = ? AND `post-user`.`received` >= ? AND `post-user`.`uid` = ? AND `post`.`author-id` != ? AND NOT `post`.`vid` IN (?, ?, ?) GROUP BY `post`.`author-id`",
                        $contact_id, DateTimeFormat::utc('now - ' . $days . ' day'), $uid, $contact_id, $follow, $view, $read);
@@ -855,7 +854,7 @@ class Relation
                $total = DBA::fetchFirst("SELECT count(*) AS `activity` FROM `post-user` INNER JOIN `post` ON `post-user`.`uri-id` = `post`.`parent-uri-id` WHERE `post-user`.`author-id` = ? AND `post-user`.`received` >= ? AND `post-user`.`uid` = ? AND `post`.`author-id` != ? AND NOT `post`.`vid` IN (?, ?, ?)",
                        $contact_id, DateTimeFormat::utc('now - ' . $days . ' day'), $uid, $contact_id, $follow, $view, $read);
 
-               Logger::debug('Calculate thread-score', ['uid' => $uid, 'total' => $total['activity']]);
+               DI::logger()->debug('Calculate thread-score', ['uid' => $uid, 'total' => $total['activity']]);
 
                $interactions = DBA::p("SELECT `post`.`author-id`, count(*) AS `activity` FROM `post-user` INNER JOIN `post` ON `post-user`.`uri-id` = `post`.`parent-uri-id` WHERE `post-user`.`author-id` = ? AND `post-user`.`received` >= ? AND `post-user`.`uid` = ? AND `post`.`author-id` != ? AND NOT `post`.`vid` IN (?, ?, ?) GROUP BY `post`.`author-id`",
                        $contact_id, DateTimeFormat::utc('now - ' . $days . ' day'), $uid, $contact_id, $follow, $view, $read);
@@ -868,7 +867,7 @@ class Relation
                $total = DBA::fetchFirst("SELECT count(*) AS `posts` FROM `post-thread-user` WHERE EXISTS(SELECT `cid` FROM `contact-relation` WHERE `cid` = `post-thread-user`.`author-id` AND `relation-cid` = ? AND `follows`) AND `uid` = ? AND `created` > ?",
                        $contact_id, $uid, DateTimeFormat::utc('now - ' . $days . ' day'));
 
-               Logger::debug('Calculate post-score', ['uid' => $uid, 'total' => $total['posts']]);
+               DI::logger()->debug('Calculate post-score', ['uid' => $uid, 'total' => $total['posts']]);
 
                $posts = DBA::p("SELECT `author-id`, count(*) AS `posts` FROM `post-thread-user` WHERE EXISTS(SELECT `cid` FROM `contact-relation` WHERE `cid` = `post-thread-user`.`author-id` AND `relation-cid` = ? AND `follows`) AND `uid` = ? AND `created` > ? GROUP BY `author-id`",
                        $contact_id, $uid, DateTimeFormat::utc('now - ' . $days . ' day'));
@@ -878,6 +877,6 @@ class Relation
                }
                DBA::close($posts);
 
-               Logger::debug('Calculation - end', ['uid' => $uid]);
+               DI::logger()->debug('Calculation - end', ['uid' => $uid]);
        }
 }

diff --git a/src/Model/Contact/User.php b/src/Model/Contact/User.php
index 8e0f033fe60c5cc8b03e256fda9f12b729d0b224..e7f569955652a2c67d9560af237af43d945ba621 100644 (file)
--- a/src/Model/Contact/User.php
+++ b/src/Model/Contact/User.php
@@ -8,7 +8,6 @@
 namespace Friendica\Model\Contact;
 
 use Exception;
-use Friendica\Core\Logger;
 use Friendica\Core\Worker;
 use Friendica\Database\Database;
 use Friendica\Database\DBA;
@@ -41,7 +40,7 @@ class User
                }
 
                if (empty($contact['uri-id']) && empty($contact['url'])) {
-                       Logger::info('Missing contact details', ['contact' => $contact]);
+                       DI::logger()->info('Missing contact details', ['contact' => $contact]);
                        return false;
                }
 
@@ -53,7 +52,7 @@ class User
                if (!empty($contact['uri-id']) && DBA::isResult($pcontact)) {
                        $pcid = $pcontact['id'];
                } elseif (empty($contact['url']) || !($pcid = Contact::getIdForURL($contact['url'], 0, false))) {
-                       Logger::info('Public contact for user not found', ['uri-id' => $contact['uri-id'], 'uid' => $contact['uid']]);
+                       DI::logger()->info('Public contact for user not found', ['uri-id' => $contact['uri-id'], 'uid' => $contact['uid']]);
                        return false;
                }
 
@@ -64,7 +63,7 @@ class User
 
                $ret = DBA::insert('user-contact', $fields, Database::INSERT_UPDATE);
 
-               Logger::info('Inserted user contact', ['uid' => $contact['uid'], 'cid' => $pcid, 'uri-id' => $contact['uri-id'], 'ret' => $ret]);
+               DI::logger()->info('Inserted user contact', ['uid' => $contact['uid'], 'cid' => $pcid, 'uri-id' => $contact['uri-id'], 'ret' => $ret]);
 
                return $ret;
        }
@@ -91,7 +90,7 @@ class User
                                }
                                $update_fields['cid'] = $contact['pid'];
                                $ret = DBA::update('user-contact', $update_fields, ['uri-id' => $contact['uri-id'], 'uid' => $contact['uid']], true);
-                               Logger::info('Updated user contact', ['uid' => $contact['uid'], 'id' => $contact['pid'], 'uri-id' => $contact['uri-id'], 'ret' => $ret]);
+                               DI::logger()->info('Updated user contact', ['uid' => $contact['uid'], 'id' => $contact['pid'], 'uri-id' => $contact['uri-id'], 'ret' => $ret]);
                        }
 
                        DBA::close($contacts);