diff options
| author | Julien Veyssier <eneiluj@posteo.net> | 2021-10-20 18:35:51 +0300 |
|---|---|---|
| committer | Julien Veyssier <eneiluj@posteo.net> | 2022-01-03 12:27:34 +0300 |
| commit | 361f2659c41e50b72edac05150f862643614e280 (patch) | |
| tree | 415ff1f4a500f0f7c56252a06794a24bb7ea93b8 /lib | |
| parent | 48e9828d99bf681125fdaea83a1df60fa00dbf7a (diff) | |
show errors
Signed-off-by: Julien Veyssier <eneiluj@posteo.net>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Service/ImageService.php | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/lib/Service/ImageService.php b/lib/Service/ImageService.php index 1fdcb318b..c261b4925 100644 --- a/lib/Service/ImageService.php +++ b/lib/Service/ImageService.php @@ -43,10 +43,6 @@ use function preg_replace; class ImageService { /** - * @var string|null - */ - private $userId; - /** * @var ShareManager */ private $shareManager; @@ -89,7 +85,7 @@ class ImageService { } $savedFile->touch(); if (isset($res['Content-Type'])) { - if ($res['Content-Type'] === 'image/jpg') { + if (in_array($res['Content-Type'], ['image/jpg', 'image/jpeg'])) { $fileName = $fileName . '.jpg'; } elseif ($res['Content-Type'] === 'image/png') { $fileName = $fileName . '.png'; @@ -179,12 +175,13 @@ class ImageService { //$response = $e->getResponse(); //if ($response->getStatusCode() === 401) { $this->logger->warning('Impossible to download image: '.$e->getMessage(), ['app' => Application::APP_NAME]); - return ['error' => $e->getMessage()]; + return ['error' => 'Impossible to download image']; } catch (ConnectException $e) { $this->logger->error('Connection error: ' . $e->getMessage(), ['app' => Application::APP_NAME]); - return ['error' => 'Connection error: ' . $e->getMessage()]; + return ['error' => 'Connection error']; } catch (Throwable | Exception $e) { - return ['error' => 'Unknown error: ' . $e->getMessage()]; + $this->logger->error('Unknown error: ' . $e->getMessage(), ['app' => Application::APP_NAME]); + return ['error' => 'Unknown error']; } } } |