Replace Logger with DI::logger() in Relay Protocol class

diff --git a/src/Protocol/Relay.php b/src/Protocol/Relay.php
index ec0b0f25f5352187617e539b6320bd11fb9ead76..994772d191453d1d14b920547fec3475c2847882 100644 (file)
--- a/src/Protocol/Relay.php
+++ b/src/Protocol/Relay.php
@@ -11,7 +11,6 @@ use Exception;
 use Friendica\Content\Smilies;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\L10n;
-use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Database\DBA;
 use Friendica\DI;
@@ -54,24 +53,24 @@ class Relay
                $config = DI::config();
 
                if (Contact::hasFollowers($authorid)) {
-                       Logger::info('Author has got followers on this server - accepted', ['network' => $network, 'url' => $url, 'author' => $authorid, 'tags' => $tags]);
+                       DI::logger()->info('Author has got followers on this server - accepted', ['network' => $network, 'url' => $url, 'author' => $authorid, 'tags' => $tags]);
                        return true;
                }
 
                $scope = $config->get('system', 'relay_scope');
 
                if ($scope == self::SCOPE_NONE) {
-                       Logger::info('Server does not accept relay posts - rejected', ['network' => $network, 'url' => $url]);
+                       DI::logger()->info('Server does not accept relay posts - rejected', ['network' => $network, 'url' => $url]);
                        return false;
                }
 
                if (Contact::isBlocked($authorid)) {
-                       Logger::info('Author is blocked - rejected', ['author' => $authorid, 'network' => $network, 'url' => $url]);
+                       DI::logger()->info('Author is blocked - rejected', ['author' => $authorid, 'network' => $network, 'url' => $url]);
                        return false;
                }
 
                if (Contact::isHidden($authorid)) {
-                       Logger::info('Author is hidden - rejected', ['author' => $authorid, 'network' => $network, 'url' => $url]);
+                       DI::logger()->info('Author is hidden - rejected', ['author' => $authorid, 'network' => $network, 'url' => $url]);
                        return false;
                }
 
@@ -101,7 +100,7 @@ class Relay
                                $content_cleaned = mb_strtolower(BBCode::toPlaintext($cleaned, false));
 
                                if (strlen($content_cleaned) < strlen($content) / 2) {
-                                       Logger::info('Possible hashtag spam detected - rejected', ['hashtags' => $tags, 'network' => $network, 'url' => $url, 'causer' => $causer, 'content' => $content]);
+                                       DI::logger()->info('Possible hashtag spam detected - rejected', ['hashtags' => $tags, 'network' => $network, 'url' => $url, 'causer' => $causer, 'content' => $content]);
                                        return false;
                                }
                        }
@@ -109,35 +108,35 @@ class Relay
                        foreach ($tags as $tag) {
                                $tag = mb_strtolower($tag);
                                if (in_array($tag, $denyTags)) {
-                                       Logger::info('Unwanted hashtag found - rejected', ['hashtag' => $tag, 'network' => $network, 'url' => $url, 'causer' => $causer]);
+                                       DI::logger()->info('Unwanted hashtag found - rejected', ['hashtag' => $tag, 'network' => $network, 'url' => $url, 'causer' => $causer]);
                                        return false;
                                }
 
                                if (in_array($tag, $tagList)) {
-                                       Logger::info('Subscribed hashtag found - accepted', ['hashtag' => $tag, 'network' => $network, 'url' => $url, 'causer' => $causer]);
+                                       DI::logger()->info('Subscribed hashtag found - accepted', ['hashtag' => $tag, 'network' => $network, 'url' => $url, 'causer' => $causer]);
                                        return true;
                                }
 
                                // We check with "strpos" for performance issues. Only when this is true, the regular expression check is used
                                // RegExp is taken from here: https://medium.com/@shiba1014/regex-word-boundaries-with-unicode-207794f6e7ed
                                if ((strpos($content, $tag) !== false) && preg_match('/(?<=[\s,.:;"\']|^)' . preg_quote($tag, '/') . '(?=[\s,.:;"\']|$)/', $content)) {
-                                       Logger::info('Subscribed hashtag found in content - accepted', ['hashtag' => $tag, 'network' => $network, 'url' => $url, 'causer' => $causer]);
+                                       DI::logger()->info('Subscribed hashtag found in content - accepted', ['hashtag' => $tag, 'network' => $network, 'url' => $url, 'causer' => $causer]);
                                        return true;
                                }
                        }
                }
 
                if (!self::isWantedLanguage($body, 0, $authorid, $languages)) {
-                       Logger::info('Unwanted or Undetected language found - rejected', ['network' => $network, 'url' => $url, 'causer' => $causer, 'tags' => $tags]);
+                       DI::logger()->info('Unwanted or Undetected language found - rejected', ['network' => $network, 'url' => $url, 'causer' => $causer, 'tags' => $tags]);
                        return false;
                }
 
                if ($scope == self::SCOPE_ALL) {
-                       Logger::info('Server accept all posts - accepted', ['network' => $network, 'url' => $url, 'causer' => $causer, 'tags' => $tags]);
+                       DI::logger()->info('Server accept all posts - accepted', ['network' => $network, 'url' => $url, 'causer' => $causer, 'tags' => $tags]);
                        return true;
                }
 
-               Logger::info('No matching hashtags found - rejected', ['network' => $network, 'url' => $url, 'causer' => $causer, 'tags' => $tags]);
+               DI::logger()->info('No matching hashtags found - rejected', ['network' => $network, 'url' => $url, 'causer' => $causer, 'tags' => $tags]);
                return false;
        }
 
@@ -181,7 +180,7 @@ class Relay
                }
 
                if (empty($body) || Smilies::isEmojiPost($body)) {
-                       Logger::debug('Empty body or only emojis', ['body' => $body]);
+                       DI::logger()->debug('Empty body or only emojis', ['body' => $body]);
                        return true;
                }
 
@@ -189,17 +188,17 @@ class Relay
 
                foreach ($detected as $language) {
                        if (in_array($language, $user_languages)) {
-                               Logger::debug('Wanted language found in detected languages', ['language' => $language, 'detected' => $detected, 'userlang' => $user_languages, 'body' => $body]);
+                               DI::logger()->debug('Wanted language found in detected languages', ['language' => $language, 'detected' => $detected, 'userlang' => $user_languages, 'body' => $body]);
                                return true;
                        }
                }
                foreach ($languages as $language) {
                        if (in_array($language, $user_languages)) {
-                               Logger::debug('Wanted language found in defined languages', ['language' => $language, 'languages' => $languages, 'detected' => $detected, 'userlang' => $user_languages, 'body' => $body]);
+                               DI::logger()->debug('Wanted language found in defined languages', ['language' => $language, 'languages' => $languages, 'detected' => $detected, 'userlang' => $user_languages, 'body' => $body]);
                                return true;
                        }
                }
-               Logger::debug('No wanted language found', ['languages' => $languages, 'detected' => $detected, 'userlang' => $user_languages, 'body' => $body]);
+               DI::logger()->debug('No wanted language found', ['languages' => $languages, 'detected' => $detected, 'userlang' => $user_languages, 'body' => $body]);
                return false;
        }
 
@@ -216,9 +215,9 @@ class Relay
                if (in_array($gserver['network'], [Protocol::ACTIVITYPUB, Protocol::DFRN])) {
                        $system = APContact::getByURL($gserver['url'] . '/friendica');
                        if (!empty($system['sharedinbox'])) {
-                               Logger::info('Successfully probed for relay contact', ['server' => $gserver['url']]);
+                               DI::logger()->info('Successfully probed for relay contact', ['server' => $gserver['url']]);
                                $id = Contact::updateFromProbeByURL($system['url']);
-                               Logger::info('Updated relay contact', ['server' => $gserver['url'], 'id' => $id]);
+                               DI::logger()->info('Updated relay contact', ['server' => $gserver['url'], 'id' => $id]);
                                return;
                        }
                }
@@ -231,10 +230,10 @@ class Relay
                        if (DBA::isResult($old)) {
                                $fields['gsid'] = $gserver['id'];
                                $fields['contact-type'] = Contact::TYPE_RELAY;
-                               Logger::info('Assigning missing data for relay contact', ['server' => $gserver['url'], 'id' => $old['id']]);
+                               DI::logger()->info('Assigning missing data for relay contact', ['server' => $gserver['url'], 'id' => $old['id']]);
                        }
                } elseif (empty($fields) && $old['unsearchable']) {
-                       Logger::info('No content to update, quitting', ['server' => $gserver['url']]);
+                       DI::logger()->info('No content to update, quitting', ['server' => $gserver['url']]);
                        return;
                }
 
@@ -242,7 +241,7 @@ class Relay
                        $fields['updated']      = DateTimeFormat::utcNow();
                        $fields['unsearchable'] = true;
 
-                       Logger::info('Update relay contact', ['server' => $gserver['url'], 'id' => $old['id'], 'fields' => $fields]);
+                       DI::logger()->info('Update relay contact', ['server' => $gserver['url'], 'id' => $old['id'], 'fields' => $fields]);
                        Contact::update($fields, ['id' => $old['id']], $old);
                } else {
                        $default = ['created' => DateTimeFormat::utcNow(),
@@ -258,7 +257,7 @@ class Relay
 
                        $fields = array_merge($default, $fields);
 
-                       Logger::info('Create relay contact', ['server' => $gserver['url'], 'fields' => $fields]);
+                       DI::logger()->info('Create relay contact', ['server' => $gserver['url'], 'fields' => $fields]);
                        Contact::insert($fields);
                }
        }
@@ -291,7 +290,7 @@ class Relay
                }
 
                if (!empty($relay_contact)) {
-                       Logger::info('Relay contact will be marked for archival', ['id' => $relay_contact['id'], 'url' => $relay_contact['url']]);
+                       DI::logger()->info('Relay contact will be marked for archival', ['id' => $relay_contact['id'], 'url' => $relay_contact['url']]);
                        Contact::markForArchival($relay_contact);
                }
        }
@@ -421,7 +420,7 @@ class Relay
        {
                foreach (self::getList() as $server) {
                        $success = ActivityPub\Transmitter::sendRelayFollow($server['url']);
-                       Logger::debug('Resubscribed', ['profile' => $server['url'], 'success' => $success]);
+                       DI::logger()->debug('Resubscribed', ['profile' => $server['url'], 'success' => $success]);
                }
        }
 }