Replace call for Logger with DI::logger() in bluesky addon

diff --git a/bluesky/bluesky.php b/bluesky/bluesky.php
index 5bf07afbeb0a75c436800f6194bf45fa0b02e656..7f6bb9e7ab8abfbd348fcdf285684c2375f7a213 100644 (file)
--- a/bluesky/bluesky.php
+++ b/bluesky/bluesky.php
@@ -30,7 +30,6 @@ use Friendica\Content\Text\Plaintext;
 use Friendica\Core\Cache\Enum\Duration;
 use Friendica\Core\Config\Util\ConfigFileManager;
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
 use Friendica\Core\Worker;
@@ -106,16 +105,16 @@ function bluesky_item_by_link(array &$hookData)
                if (empty($did)) {
                        return;
                }
-       
-               Logger::debug('Found bluesky post', ['uri' => $hookData['uri'], 'did' => $did, 'cid' => $matches[2]]);
-       
+
+               DI::logger()->debug('Found bluesky post', ['uri' => $hookData['uri'], 'did' => $did, 'cid' => $matches[2]]);
+
                $uri = 'at://' . $did . '/app.bsky.feed.post/' . $matches[2];
        } else {
                $uri = $hookData['uri'];
        }
 
        $uri = DI::atpProcessor()->fetchMissingPost($uri, $hookData['uid'], Item::PR_FETCHED, 0, 0);
-       Logger::debug('Got post', ['uri' => $uri]);
+       DI::logger()->debug('Got post', ['uri' => $uri]);
        if (!empty($uri)) {
                $item = Post::selectFirst(['id'], ['uri' => $uri, 'uid' => $hookData['uid']]);
                if (!empty($item['id'])) {
@@ -138,7 +137,7 @@ function bluesky_follow(array &$hook_data)
                return;
        }
 
-       Logger::debug('Check if contact is bluesky', ['data' => $hook_data]);
+       DI::logger()->debug('Check if contact is bluesky', ['data' => $hook_data]);
        $contact = DBA::selectFirst('contact', [], ['network' => Protocol::BLUESKY, 'url' => $hook_data['url'], 'uid' => [0, $hook_data['uid']]]);
        if (empty($contact)) {
                return;
@@ -159,7 +158,7 @@ function bluesky_follow(array &$hook_data)
        $activity = DI::atProtocol()->XRPCPost($hook_data['uid'], 'com.atproto.repo.createRecord', $post);
        if (!empty($activity->uri)) {
                $hook_data['contact'] = $contact;
-               Logger::debug('Successfully start following', ['url' => $contact['url'], 'uri' => $activity->uri]);
+               DI::logger()->debug('Successfully start following', ['url' => $contact['url'], 'uri' => $activity->uri]);
        }
 }
 
@@ -213,7 +212,7 @@ function bluesky_block(array &$hook_data)
                if ($ucid) {
                        Contact::remove($ucid);
                }
-               Logger::debug('Successfully blocked contact', ['url' => $hook_data['contact']['url'], 'uri' => $activity->uri]);
+               DI::logger()->debug('Successfully blocked contact', ['url' => $hook_data['contact']['url'], 'uri' => $activity->uri]);
        }
 }
 
@@ -421,11 +420,11 @@ function bluesky_cron()
        if ($last) {
                $next = $last + ($poll_interval * 60);
                if ($next > time()) {
-                       Logger::notice('poll interval not reached');
+                       DI::logger()->notice('poll interval not reached');
                        return;
                }
        }
-       Logger::notice('cron_start');
+       DI::logger()->notice('cron_start');
 
        $abandon_days = intval(DI::config()->get('system', 'account_abandon_days'));
        if ($abandon_days < 1) {
@@ -437,19 +436,19 @@ function bluesky_cron()
        $pconfigs = DBA::selectToArray('pconfig', [], ["`cat` = ? AND `k` IN (?, ?) AND `v`", 'bluesky', 'import', 'import_feeds']);
        foreach ($pconfigs as $pconfig) {
                if (empty(DI::atProtocol()->getUserDid($pconfig['uid']))) {
-                       Logger::debug('User has got no valid DID', ['uid' => $pconfig['uid']]);
+                       DI::logger()->debug('User has got no valid DID', ['uid' => $pconfig['uid']]);
                        continue;
                }
 
                if ($abandon_days != 0) {
                        if (!DBA::exists('user', ["`uid` = ? AND `login_date` >= ?", $pconfig['uid'], $abandon_limit])) {
-                               Logger::notice('abandoned account: timeline from user will not be imported', ['user' => $pconfig['uid']]);
+                               DI::logger()->notice('abandoned account: timeline from user will not be imported', ['user' => $pconfig['uid']]);
                                continue;
                        }
                }
 
                // Refresh the token now, so that it doesn't need to be refreshed in parallel by the following workers
-               Logger::debug('Refresh the token', ['uid' => $pconfig['uid']]);
+               DI::logger()->debug('Refresh the token', ['uid' => $pconfig['uid']]);
                DI::atProtocol()->getUserToken($pconfig['uid']);
 
                $last_sync = DI::pConfig()->get($pconfig['uid'], 'bluesky', 'last_contact_sync');
@@ -463,32 +462,32 @@ function bluesky_cron()
                        Worker::add(['priority' => Worker::PRIORITY_MEDIUM, 'force_priority' => true], 'addon/bluesky/bluesky_timeline.php', $pconfig['uid']);
                }
                if (DI::pConfig()->get($pconfig['uid'], 'bluesky', 'import_feeds')) {
-                       Logger::debug('Fetch feeds for user', ['uid' => $pconfig['uid']]);
+                       DI::logger()->debug('Fetch feeds for user', ['uid' => $pconfig['uid']]);
                        $feeds = bluesky_get_feeds($pconfig['uid']);
                        foreach ($feeds as $feed) {
                                Worker::add(['priority' => Worker::PRIORITY_MEDIUM, 'force_priority' => true], 'addon/bluesky/bluesky_feed.php', $pconfig['uid'], $feed);
                        }
                }
-               Logger::debug('Polling done for user', ['uid' => $pconfig['uid']]);
+               DI::logger()->debug('Polling done for user', ['uid' => $pconfig['uid']]);
        }
 
-       Logger::notice('Polling done for all users');
+       DI::logger()->notice('Polling done for all users');
 
        DI::keyValue()->set('bluesky_last_poll', time());
 
        $last_clean = DI::keyValue()->get('bluesky_last_clean');
        if (empty($last_clean) || ($last_clean + 86400 < time())) {
-               Logger::notice('Start contact cleanup');
+               DI::logger()->notice('Start contact cleanup');
                $contacts = DBA::select('account-user-view', ['id', 'pid'], ["`network` = ? AND `uid` != ? AND `rel` = ?", Protocol::BLUESKY, 0, Contact::NOTHING]);
                while ($contact = DBA::fetch($contacts)) {
                        Worker::add(Worker::PRIORITY_LOW, 'MergeContact', $contact['pid'], $contact['id'], 0);
                }
                DBA::close($contacts);
                DI::keyValue()->set('bluesky_last_clean', time());
-               Logger::notice('Contact cleanup done');
+               DI::logger()->notice('Contact cleanup done');
        }
 
-       Logger::notice('cron_end');
+       DI::logger()->notice('cron_end');
 }
 
 function bluesky_hook_fork(array &$b)
@@ -508,7 +507,7 @@ function bluesky_hook_fork(array &$b)
        if (DI::pConfig()->get($post['uid'], 'bluesky', 'import')) {
                // Don't post if it isn't a reply to a bluesky post
                if (($post['gravity'] != Item::GRAVITY_PARENT) && !Post::exists(['id' => $post['parent'], 'network' => Protocol::BLUESKY])) {
-                       Logger::notice('No bluesky parent found', ['item' => $post['id']]);
+                       DI::logger()->notice('No bluesky parent found', ['item' => $post['id']]);
                        $b['execute'] = false;
                        return;
                }
@@ -555,12 +554,12 @@ function bluesky_send(array &$b)
        }
 
        if ($b['gravity'] != Item::GRAVITY_PARENT) {
-               Logger::debug('Got comment', ['item' => $b]);
+               DI::logger()->debug('Got comment', ['item' => $b]);
 
                if ($b['deleted']) {
                        $uri = DI::atpProcessor()->getUriClass($b['uri']);
                        if (empty($uri)) {
-                               Logger::debug('Not a bluesky post', ['uri' => $b['uri']]);
+                               DI::logger()->debug('Not a bluesky post', ['uri' => $b['uri']]);
                                return;
                        }
                        bluesky_delete_post($b['uri'], $b['uid']);
@@ -571,12 +570,12 @@ function bluesky_send(array &$b)
                $parent = DI::atpProcessor()->getUriClass($b['thr-parent']);
 
                if (empty($root) || empty($parent)) {
-                       Logger::debug('No bluesky post', ['parent' => $b['parent'], 'thr-parent' => $b['thr-parent']]);
+                       DI::logger()->debug('No bluesky post', ['parent' => $b['parent'], 'thr-parent' => $b['thr-parent']]);
                        return;
                }
 
                if ($b['gravity'] == Item::GRAVITY_COMMENT) {
-                       Logger::debug('Posting comment', ['root' => $root, 'parent' => $parent]);
+                       DI::logger()->debug('Posting comment', ['root' => $root, 'parent' => $parent]);
                        bluesky_create_post($b, $root, $parent);
                        return;
                } elseif (in_array($b['verb'], [Activity::LIKE, Activity::ANNOUNCE])) {
@@ -635,10 +634,10 @@ function bluesky_create_activity(array $item, stdClass $parent = null)
        if (empty($activity->uri)) {
                return;
        }
-       Logger::debug('Activity done', ['return' => $activity]);
+       DI::logger()->debug('Activity done', ['return' => $activity]);
        $uri = DI::atpProcessor()->getUri($activity);
        Item::update(['extid' => $uri], ['guid' => $item['guid']]);
-       Logger::debug('Set extid', ['id' => $item['id'], 'extid' => $activity]);
+       DI::logger()->debug('Set extid', ['id' => $item['id'], 'extid' => $activity]);
 }
 
 function bluesky_create_post(array $item, stdClass $root = null, stdClass $parent = null)
@@ -722,14 +721,14 @@ function bluesky_create_post(array $item, stdClass $root = null, stdClass $paren
                        }
                        return;
                }
-               Logger::debug('Posting done', ['return' => $parent]);
+               DI::logger()->debug('Posting done', ['return' => $parent]);
                if (empty($root)) {
                        $root = $parent;
                }
                if (($key == 0) && ($item['gravity'] != Item::GRAVITY_PARENT)) {
                        $uri = DI::atpProcessor()->getUri($parent);
                        Item::update(['extid' => $uri], ['guid' => $item['guid']]);
-                       Logger::debug('Set extid', ['id' => $item['id'], 'extid' => $uri]);
+                       DI::logger()->debug('Set extid', ['id' => $item['id'], 'extid' => $uri]);
                }
        }
 }
@@ -899,20 +898,20 @@ function bluesky_upload_blob(int $uid, array $photo): ?stdClass
        $new_size   = strlen($content);
 
        if (($size != 0) && ($new_size == 0) && ($retrial == 0)) {
-               Logger::warning('Size is empty after resize, uploading original file', ['uid' => $uid, 'retrial' => $retrial, 'height' => $new_height, 'width' => $new_width, 'size' => $new_size, 'orig-height' => $height, 'orig-width' => $width, 'orig-size' => $size]);
+               DI::logger()->warning('Size is empty after resize, uploading original file', ['uid' => $uid, 'retrial' => $retrial, 'height' => $new_height, 'width' => $new_width, 'size' => $new_size, 'orig-height' => $height, 'orig-width' => $width, 'orig-size' => $size]);
                $content = Photo::getImageForPhoto($photo);
        } else {
-               Logger::info('Uploading', ['uid' => $uid, 'retrial' => $retrial, 'height' => $new_height, 'width' => $new_width, 'size' => $new_size, 'orig-height' => $height, 'orig-width' => $width, 'orig-size' => $size]);
+               DI::logger()->info('Uploading', ['uid' => $uid, 'retrial' => $retrial, 'height' => $new_height, 'width' => $new_width, 'size' => $new_size, 'orig-height' => $height, 'orig-width' => $width, 'orig-size' => $size]);
        }
 
        $data = DI::atProtocol()->post($uid, '/xrpc/com.atproto.repo.uploadBlob', $content, ['Content-type' => $photo['type'], 'Authorization' => ['Bearer ' . DI::atProtocol()->getUserToken($uid)]]);
        if (empty($data) || empty($data->blob)) {
-               Logger::info('Uploading failed', ['uid' => $uid, 'retrial' => $retrial, 'height' => $new_height, 'width' => $new_width, 'size' => $new_size, 'orig-height' => $height, 'orig-width' => $width, 'orig-size' => $size]);
+               DI::logger()->info('Uploading failed', ['uid' => $uid, 'retrial' => $retrial, 'height' => $new_height, 'width' => $new_width, 'size' => $new_size, 'orig-height' => $height, 'orig-width' => $width, 'orig-size' => $size]);
                return null;
        }
 
        Item::incrementOutbound(Protocol::BLUESKY);
-       Logger::debug('Uploaded blob', ['return' => $data, 'uid' => $uid, 'retrial' => $retrial, 'height' => $new_height, 'width' => $new_width, 'size' => $new_size, 'orig-height' => $height, 'orig-width' => $width, 'orig-size' => $size]);
+       DI::logger()->debug('Uploaded blob', ['return' => $data, 'uid' => $uid, 'retrial' => $retrial, 'height' => $new_height, 'width' => $new_width, 'size' => $new_size, 'orig-height' => $height, 'orig-width' => $width, 'orig-size' => $size]);
        return $data->blob;
 }
 
@@ -920,11 +919,11 @@ function bluesky_delete_post(string $uri, int $uid)
 {
        $parts = DI::atpProcessor()->getUriParts($uri);
        if (empty($parts)) {
-               Logger::debug('No uri delected', ['uri' => $uri]);
+               DI::logger()->debug('No uri delected', ['uri' => $uri]);
                return;
        }
        DI::atProtocol()->XRPCPost($uid, 'com.atproto.repo.deleteRecord', $parts);
-       Logger::debug('Deleted', ['parts' => $parts]);
+       DI::logger()->debug('Deleted', ['parts' => $parts]);
 }
 
 function bluesky_fetch_timeline(int $uid)
@@ -1026,10 +1025,10 @@ function bluesky_fetch_notifications(int $uid)
        foreach ($data->notifications as $notification) {
                $uri = DI::atpProcessor()->getUri($notification);
                if (Post::exists(['uri' => $uri, 'uid' => $uid]) || Post::exists(['extid' => $uri, 'uid' => $uid])) {
-                       Logger::debug('Notification already processed', ['uid' => $uid, 'reason' => $notification->reason, 'uri' => $uri, 'indexedAt' => $notification->indexedAt]);
+                       DI::logger()->debug('Notification already processed', ['uid' => $uid, 'reason' => $notification->reason, 'uri' => $uri, 'indexedAt' => $notification->indexedAt]);
                        continue;
                }
-               Logger::debug('Process notification', ['uid' => $uid, 'reason' => $notification->reason, 'uri' => $uri, 'indexedAt' => $notification->indexedAt]);
+               DI::logger()->debug('Process notification', ['uid' => $uid, 'reason' => $notification->reason, 'uri' => $uri, 'indexedAt' => $notification->indexedAt]);
                switch ($notification->reason) {
                        case 'like':
                                $item = DI::atpProcessor()->getHeaderFromPost($notification, $uri, $uid, Conversation::PARCEL_CONNECTOR);
@@ -1039,9 +1038,9 @@ function bluesky_fetch_notifications(int $uid)
                                $item['thr-parent'] = DI::atpProcessor()->fetchMissingPost($item['thr-parent'], $uid, Item::PR_FETCHED, $item['contact-id'], 0);
                                if (!empty($item['thr-parent'])) {
                                        $data = Item::insert($item);
-                                       Logger::debug('Got like', ['uid' => $uid, 'result' => $data, 'uri' => $uri]);
+                                       DI::logger()->debug('Got like', ['uid' => $uid, 'result' => $data, 'uri' => $uri]);
                                } else {
-                                       Logger::info('Thread parent not found', ['uid' => $uid, 'parent' => $item['thr-parent'], 'uri' => $uri]);
+                                       DI::logger()->info('Thread parent not found', ['uid' => $uid, 'parent' => $item['thr-parent'], 'uri' => $uri]);
                                }
                                break;
 
@@ -1053,37 +1052,37 @@ function bluesky_fetch_notifications(int $uid)
                                $item['thr-parent'] = DI::atpProcessor()->fetchMissingPost($item['thr-parent'], $uid, Item::PR_FETCHED, $item['contact-id'], 0);
                                if (!empty($item['thr-parent'])) {
                                        $data = Item::insert($item);
-                                       Logger::debug('Got repost', ['uid' => $uid, 'result' => $data, 'uri' => $uri]);
+                                       DI::logger()->debug('Got repost', ['uid' => $uid, 'result' => $data, 'uri' => $uri]);
                                } else {
-                                       Logger::info('Thread parent not found', ['uid' => $uid, 'parent' => $item['thr-parent'], 'uri' => $uri]);
+                                       DI::logger()->info('Thread parent not found', ['uid' => $uid, 'parent' => $item['thr-parent'], 'uri' => $uri]);
                                }
                                break;
 
                        case 'follow':
                                $contact = DI::atpActor()->getContactByDID($notification->author->did, $uid, $uid);
-                               Logger::debug('New follower', ['uid' => $uid, 'nick' => $contact['nick'], 'uri' => $uri]);
+                               DI::logger()->debug('New follower', ['uid' => $uid, 'nick' => $contact['nick'], 'uri' => $uri]);
                                break;
 
                        case 'mention':
                                $contact = DI::atpActor()->getContactByDID($notification->author->did, $uid, 0);
                                $result  = DI::atpProcessor()->fetchMissingPost($uri, $uid, Item::PR_TO, $contact['id'], 0);
-                               Logger::debug('Got mention', ['uid' => $uid, 'nick' => $contact['nick'], 'result' => $result, 'uri' => $uri]);
+                               DI::logger()->debug('Got mention', ['uid' => $uid, 'nick' => $contact['nick'], 'result' => $result, 'uri' => $uri]);
                                break;
 
                        case 'reply':
                                $contact = DI::atpActor()->getContactByDID($notification->author->did, $uid, 0);
                                $result  = DI::atpProcessor()->fetchMissingPost($uri, $uid, Item::PR_COMMENT, $contact['id'], 0);
-                               Logger::debug('Got reply', ['uid' => $uid, 'nick' => $contact['nick'], 'result' => $result, 'uri' => $uri]);
+                               DI::logger()->debug('Got reply', ['uid' => $uid, 'nick' => $contact['nick'], 'result' => $result, 'uri' => $uri]);
                                break;
 
                        case 'quote':
                                $contact = DI::atpActor()->getContactByDID($notification->author->did, $uid, 0);
                                $result  = DI::atpProcessor()->fetchMissingPost($uri, $uid, Item::PR_PUSHED, $contact['id'], 0);
-                               Logger::debug('Got quote', ['uid' => $uid, 'nick' => $contact['nick'], 'result' => $result, 'uri' => $uri]);
+                               DI::logger()->debug('Got quote', ['uid' => $uid, 'nick' => $contact['nick'], 'result' => $result, 'uri' => $uri]);
                                break;
 
                        default:
-                               Logger::notice('Unhandled reason', ['reason' => $notification->reason, 'uri' => $uri]);
+                               DI::logger()->notice('Unhandled reason', ['reason' => $notification->reason, 'uri' => $uri]);
                                break;
                }
        }
@@ -1114,16 +1113,16 @@ function bluesky_fetch_feed(int $uid, string $feed)
                $languages = $entry->post->record->langs ?? [];
 
                if (!Relay::isWantedLanguage($entry->post->record->text, 0, $contact['id'] ?? 0, $languages)) {
-                       Logger::debug('Unwanted language detected', ['languages' => $languages, 'text' => $entry->post->record->text]);
+                       DI::logger()->debug('Unwanted language detected', ['languages' => $languages, 'text' => $entry->post->record->text]);
                        continue;
                }
                $causer = DI::atpActor()->getContactByDID($entry->post->author->did, $uid, 0);
                $uri_id = bluesky_complete_post($entry->post, $uid, Item::PR_TAG, $causer['id'], Conversation::PARCEL_CONNECTOR);
                if (!empty($uri_id)) {
                        $stored = Post\Category::storeFileByURIId($uri_id, $uid, Post\Category::SUBCRIPTION, $feedname, $feedurl);
-                       Logger::debug('Stored tag subscription for user', ['uri-id' => $uri_id, 'uid' => $uid, 'name' => $feedname, 'url' => $feedurl, 'stored' => $stored]);
+                       DI::logger()->debug('Stored tag subscription for user', ['uri-id' => $uri_id, 'uid' => $uid, 'name' => $feedname, 'url' => $feedurl, 'stored' => $stored]);
                } else {
-                       Logger::notice('Post not found', ['entry' => $entry]);
+                       DI::logger()->notice('Post not found', ['entry' => $entry]);
                }
                if (!empty($entry->reason)) {
                        bluesky_process_reason($entry->reason, DI::atpProcessor()->getUri($entry->post), $uid);

diff --git a/bluesky/bluesky_feed.php b/bluesky/bluesky_feed.php
index a20ef1b93ba141fef23801b3f05d378220f7af22..e4aa3fdcb19a5da70f02bf5b4cf1b088077e5864 100644 (file)
--- a/bluesky/bluesky_feed.php
+++ b/bluesky/bluesky_feed.php
@@ -1,6 +1,6 @@
 <?php
 
-use Friendica\Core\Logger;
+use Friendica\DI;
 
 function bluesky_feed_run($argv, $argc)
 {
@@ -10,7 +10,7 @@ function bluesky_feed_run($argv, $argc)
                return;
        }
 
-       Logger::debug('Importing feed - start', ['user' => $argv[1], 'feed' => $argv[2]]);
+       DI::logger()->debug('Importing feed - start', ['user' => $argv[1], 'feed' => $argv[2]]);
        bluesky_fetch_feed($argv[1], $argv[2]);
-       Logger::debug('Importing feed - done', ['user' => $argv[1], 'feed' => $argv[2]]);
+       DI::logger()->debug('Importing feed - done', ['user' => $argv[1], 'feed' => $argv[2]]);
 }

diff --git a/bluesky/bluesky_notifications.php b/bluesky/bluesky_notifications.php
index 1fbc8f6771ad9f14df12e346a8450d8c216ed79d..e1bf20471f11bbb75d1da022c545c7c951904096 100644 (file)
--- a/bluesky/bluesky_notifications.php
+++ b/bluesky/bluesky_notifications.php
@@ -1,6 +1,6 @@
 <?php
 
-use Friendica\Core\Logger;
+use Friendica\DI;
 
 function bluesky_notifications_run($argv, $argc)
 {
@@ -10,7 +10,7 @@ function bluesky_notifications_run($argv, $argc)
                return;
        }
 
-       Logger::notice('importing notifications - start', ['user' => $argv[1]]);
+       DI::logger()->notice('importing notifications - start', ['user' => $argv[1]]);
        bluesky_fetch_notifications($argv[1]);
-       Logger::notice('importing notifications - done', ['user' => $argv[1]]);
+       DI::logger()->notice('importing notifications - done', ['user' => $argv[1]]);
 }

diff --git a/bluesky/bluesky_timeline.php b/bluesky/bluesky_timeline.php
index fda846babe7ee91b6a2156ef862ab2d7601f62aa..37b22d99d81166f6d9f873e61a82d6900f4764bd 100644 (file)
--- a/bluesky/bluesky_timeline.php
+++ b/bluesky/bluesky_timeline.php
@@ -1,6 +1,6 @@
 <?php
 
-use Friendica\Core\Logger;
+use Friendica\DI;
 
 function bluesky_timeline_run($argv, $argc)
 {
@@ -10,7 +10,7 @@ function bluesky_timeline_run($argv, $argc)
                return;
        }
 
-       Logger::notice('importing timeline - start', ['user' => $argv[1]]);
+       DI::logger()->notice('importing timeline - start', ['user' => $argv[1]]);
        bluesky_fetch_timeline($argv[1]);
-       Logger::notice('importing timeline - done', ['user' => $argv[1]]);
+       DI::logger()->notice('importing timeline - done', ['user' => $argv[1]]);
 }