From 064fd922e715d454b9d4b6cbcc55776ddb30d884 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Mon, 31 Jul 2023 01:11:33 +0200 Subject: [PATCH] Add default profile picture path dependency - Update default profile picture --- public/assets/images/default-profile-sm.jpg | Bin 325 -> 2669 bytes src/classes/Controllers/Api/Photo.php | 10 ++++++++-- src/classes/Routes/Http/Photo.php | 3 ++- src/dependencies.php | 2 ++ 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/public/assets/images/default-profile-sm.jpg b/public/assets/images/default-profile-sm.jpg index ea0030ede0245aeb76f658c20bad85d093df3f7f..5733602f320b427d02fbf0faf176dc3e1dc75073 100644 GIT binary patch delta 2506 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 UO;Z!UD4c~60T2NI?Px#$*++b7asU7T literal 325 zcmex=atlas = $atlas; + $this->defaultProfilePictureSmallPath = $defaultProfilePictureSmallPath; } public function render(Request $request, Response $response, array $args): Response @@ -30,7 +36,7 @@ class Photo ); if (!$data) { - $data = file_get_contents('public/images/default-profile-sm.jpg'); + $data = file_get_contents($this->defaultProfilePictureSmallPath); } //Try and cache our result. diff --git a/src/classes/Routes/Http/Photo.php b/src/classes/Routes/Http/Photo.php index 6afb643..8b1e6e1 100644 --- a/src/classes/Routes/Http/Photo.php +++ b/src/classes/Routes/Http/Photo.php @@ -10,7 +10,8 @@ class Photo extends BaseRoute public function __invoke(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args): \Slim\Http\Response { return (new \Friendica\Directory\Controllers\Api\Photo( - $this->container->atlas + $this->container->atlas, + $this->container->get('defaultProfilePictureSmallPath') ))->render($request, $response, $args); } } diff --git a/src/dependencies.php b/src/dependencies.php index ec6c5a0..5ab5608 100644 --- a/src/dependencies.php +++ b/src/dependencies.php @@ -99,6 +99,8 @@ $container['http'] = function (ContainerInterface $c): GuzzleHttp\ClientInterfac return new GuzzleHttp\Client(['timeout' => 20, 'headers' => ['User-Agent' => 'FriendicaDirectory/' . trim($version) . ' ' . \GuzzleHttp\default_user_agent()]]); }; +$container['defaultProfilePictureSmallPath'] = __DIR__ . '/../public/assets/images/default-profile-sm.jpg'; + // Internal Dependency Injection $container[\Friendica\Directory\Models\Profile::class] = function (ContainerInterface $c): Friendica\Directory\Models\Profile {