From d4873dbc6b27f5b826412e1acd6ba4cb36c27f78 Mon Sep 17 00:00:00 2001 From: Art4 Date: Mon, 13 Jan 2025 11:55:30 +0000 Subject: [PATCH] Replace Logger with $this->logger in Module Twitter classes --- src/Module/Api/Twitter/Favorites.php | 3 +-- src/Module/Api/Twitter/Friendships/Destroy.php | 9 ++++----- src/Module/Api/Twitter/Media/Metadata/Create.php | 3 +-- src/Module/Api/Twitter/Media/Upload.php | 4 +--- src/Module/Api/Twitter/Statuses/Show.php | 3 +-- src/Module/Api/Twitter/Statuses/UserTimeline.php | 3 +-- 6 files changed, 9 insertions(+), 16 deletions(-) diff --git a/src/Module/Api/Twitter/Favorites.php b/src/Module/Api/Twitter/Favorites.php index 4c0841147f..f2fda383f6 100644 --- 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 cf014134c0..840f8c1155 100644 --- 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 049e6f7061..a12550f7a4 100644 --- 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 897705539c..67bc65b6b8 100644 --- 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 98a5e3c799..075f6311f6 100644 --- 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 1332ca113e..64e6ec4309 100644 --- 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);