Replace Logger with $this->logger in Module Twitter classes

diff --git a/src/Module/Api/Twitter/Favorites.php b/src/Module/Api/Twitter/Favorites.php
index 4c0841147f7e71ff7c6df51b4c3faeca427b48a3..f2fda383f6d4ce5c678c6a3d34bb44f0c09cab59 100644 (file)
--- a/src/Module/Api/Twitter/Favorites.php
+++ b/src/Module/Api/Twitter/Favorites.php
@@ -7,7 +7,6 @@
 
 namespace Friendica\Module\Api\Twitter;
 
-use Friendica\Core\Logger;
 use Friendica\Database\DBA;
 use Friendica\Model\Item;
 use Friendica\Module\BaseApi;
@@ -29,7 +28,7 @@ class Favorites extends BaseApi
 
                // in friendica starred item are private
                // return favorites only for self
-               Logger::info(BaseApi::LOG_PREFIX . 'for {self}', ['module' => 'api', 'action' => 'favorites']);
+               $this->logger->info(BaseApi::LOG_PREFIX . 'for {self}', ['module' => 'api', 'action' => 'favorites']);
 
                // params
                $count            = $this->getRequestValue($request, 'count', 20, 1, 100);

diff --git a/src/Module/Api/Twitter/Friendships/Destroy.php b/src/Module/Api/Twitter/Friendships/Destroy.php
index cf014134c09af4aaa992e18c56233dfc75326044..840f8c11555af5ba7becc0452c2b175f104069e9 100644 (file)
--- a/src/Module/Api/Twitter/Friendships/Destroy.php
+++ b/src/Module/Api/Twitter/Friendships/Destroy.php
@@ -12,7 +12,6 @@ use Friendica\App\Arguments;
 use Friendica\App\BaseURL;
 use Friendica\AppHelper;
 use Friendica\Core\L10n;
-use Friendica\Core\Logger;
 use Friendica\Factory\Api\Twitter\User as TwitterUser;
 use Friendica\Model\Contact;
 use Friendica\Model\User;
@@ -47,21 +46,21 @@ class Destroy extends ContactEndpoint
 
                $owner = User::getOwnerDataById($uid);
                if (!$owner) {
-                       Logger::notice(BaseApi::LOG_PREFIX . 'No owner {uid} found', ['module' => 'api', 'action' => 'friendships_destroy', 'uid' => $uid]);
+                       $this->logger->notice(BaseApi::LOG_PREFIX . 'No owner {uid} found', ['module' => 'api', 'action' => 'friendships_destroy', 'uid' => $uid]);
                        throw new HTTPException\NotFoundException('Error Processing Request');
                }
 
                $contact_id = BaseApi::getContactIDForSearchterm($this->getRequestValue($request, 'screen_name', ''), $this->getRequestValue($request, 'profileurl', ''), $this->getRequestValue($request, 'user_id', 0), 0);
 
                if (empty($contact_id)) {
-                       Logger::notice(BaseApi::LOG_PREFIX . 'No user_id specified', ['module' => 'api', 'action' => 'friendships_destroy']);
+                       $this->logger->notice(BaseApi::LOG_PREFIX . 'No user_id specified', ['module' => 'api', 'action' => 'friendships_destroy']);
                        throw new HTTPException\BadRequestException('no user_id specified');
                }
 
                // Get Contact by given id
                $ucid = Contact::getUserContactId($contact_id, $uid);
                if (!$ucid) {
-                       Logger::notice(BaseApi::LOG_PREFIX . 'Not following contact', ['module' => 'api', 'action' => 'friendships_destroy']);
+                       $this->logger->notice(BaseApi::LOG_PREFIX . 'Not following contact', ['module' => 'api', 'action' => 'friendships_destroy']);
                        throw new HTTPException\NotFoundException('Not following Contact');
                }
 
@@ -71,7 +70,7 @@ class Destroy extends ContactEndpoint
                try {
                        Contact::unfollow($contact);
                } catch (Exception $e) {
-                       Logger::error(BaseApi::LOG_PREFIX . $e->getMessage(), ['contact' => $contact]);
+                       $this->logger->error(BaseApi::LOG_PREFIX . $e->getMessage(), ['contact' => $contact]);
                        throw new HTTPException\InternalServerErrorException('Unable to unfollow this contact, please contact your administrator');
                }
 

diff --git a/src/Module/Api/Twitter/Media/Metadata/Create.php b/src/Module/Api/Twitter/Media/Metadata/Create.php
index 049e6f706135b7428aa6f11368fb8f01dd6b0465..a12550f7a4d58033076bf0a39b32cfc9d908efb0 100644 (file)
--- a/src/Module/Api/Twitter/Media/Metadata/Create.php
+++ b/src/Module/Api/Twitter/Media/Metadata/Create.php
@@ -7,7 +7,6 @@
 
 namespace Friendica\Module\Api\Twitter\Media\Metadata;
 
-use Friendica\Core\Logger;
 use Friendica\Model\Photo;
 use Friendica\Module\BaseApi;
 use Friendica\Network\HTTPException\BadRequestException;
@@ -44,7 +43,7 @@ class Create extends BaseApi
                        throw new BadRequestException('No alt text.');
                }
 
-               Logger::info('Updating metadata', ['media_id' => $data['media_id']]);
+               $this->logger->info('Updating metadata', ['media_id' => $data['media_id']]);
 
                $condition = ['id' => $data['media_id'], 'uid' => $uid];
 

diff --git a/src/Module/Api/Twitter/Media/Upload.php b/src/Module/Api/Twitter/Media/Upload.php
index 897705539ce79c9698f785492102944890fc78f1..67bc65b6b8709c51348b36b3b1e25baf2de1510e 100644 (file)
--- a/src/Module/Api/Twitter/Media/Upload.php
+++ b/src/Module/Api/Twitter/Media/Upload.php
@@ -7,8 +7,6 @@
 
 namespace Friendica\Module\Api\Twitter\Media;
 
-use Friendica\Core\Logger;
-use Friendica\DI;
 use Friendica\Model\Photo;
 use Friendica\Module\BaseApi;
 use Friendica\Network\HTTPException\BadRequestException;
@@ -49,7 +47,7 @@ class Upload extends BaseApi
                        "friendica_preview_url" => $media["preview"]
                ];
 
-               Logger::info('Media uploaded', ['return' => $returndata]);
+               $this->logger->info('Media uploaded', ['return' => $returndata]);
 
                $this->response->addFormattedContent('media', ['media' => $returndata], $this->parameters['extension'] ?? null);
        }

diff --git a/src/Module/Api/Twitter/Statuses/Show.php b/src/Module/Api/Twitter/Statuses/Show.php
index 98a5e3c799cd3519224ce62bd0c7689d42c2e7a7..075f6311f646a1448f3c2d43413465478938ee23 100644 (file)
--- a/src/Module/Api/Twitter/Statuses/Show.php
+++ b/src/Module/Api/Twitter/Statuses/Show.php
@@ -7,7 +7,6 @@
 
 namespace Friendica\Module\Api\Twitter\Statuses;
 
-use Friendica\Core\Logger;
 use Friendica\Database\DBA;
 use Friendica\Module\BaseApi;
 use Friendica\DI;
@@ -34,7 +33,7 @@ class Show extends BaseApi
                        throw new BadRequestException('An id is missing.');
                }
 
-               Logger::notice('API: api_statuses_show: ' . $id);
+               $this->logger->notice('API: api_statuses_show: ' . $id);
 
                $conversation = !empty($request['conversation']);
 

diff --git a/src/Module/Api/Twitter/Statuses/UserTimeline.php b/src/Module/Api/Twitter/Statuses/UserTimeline.php
index 1332ca113eea191fbddd043bb07c2da1ae0bfdff..64e6ec43090dacd60a942aa79e8485fec1bd2d07 100644 (file)
--- a/src/Module/Api/Twitter/Statuses/UserTimeline.php
+++ b/src/Module/Api/Twitter/Statuses/UserTimeline.php
@@ -7,7 +7,6 @@
 
 namespace Friendica\Module\Api\Twitter\Statuses;
 
-use Friendica\Core\Logger;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
@@ -27,7 +26,7 @@ class UserTimeline extends BaseApi
                $this->checkAllowedScope(BaseApi::SCOPE_READ);
                $uid = BaseApi::getCurrentUserID();
 
-               Logger::info('api_statuses_user_timeline', ['api_user' => $uid, '_REQUEST' => $request]);
+               $this->logger->info('api_statuses_user_timeline', ['api_user' => $uid, '_REQUEST' => $request]);
 
                $cid              = BaseApi::getContactIDForSearchterm($this->getRequestValue($request, 'screen_name', ''), $this->getRequestValue($request, 'profileurl', ''), $this->getRequestValue($request, 'user_id', 0), $uid);
                $count            = $this->getRequestValue($request, 'count', 20, 1, 100);