diff --git a/config/services.yaml b/config/services.yaml index a5c58c2..82ac295 100644 --- a/config/services.yaml +++ b/config/services.yaml @@ -14,6 +14,7 @@ services: # TODO: fix retrieval # Telegram Bot API $telegramToken: '' + $debugEnabled: '%kernel.debug%' # Point API $pointDomain: 'point.im' $pointScheme: 'https' diff --git a/old/src/PointToolsBundle/Controller/Telegram/WebHookController.php b/src/Controller/Telegram/WebHookController.php similarity index 67% rename from old/src/PointToolsBundle/Controller/Telegram/WebHookController.php rename to src/Controller/Telegram/WebHookController.php index 9e443c5..943a2cf 100644 --- a/old/src/PointToolsBundle/Controller/Telegram/WebHookController.php +++ b/src/Controller/Telegram/WebHookController.php @@ -1,28 +1,20 @@ telegramToken = $telegramToken; - $this->debug = $debug; + public function __construct( + private readonly string $telegramToken, + private readonly bool $debugEnabled, + ) { } public function receiveUpdateAction(Request $request, string $token, IncomingUpdateDispatcher $updateDispatcher, LoggerInterface $logger): Response @@ -31,21 +23,20 @@ class WebHookController extends AbstractController throw $this->createNotFoundException(); } - $content = json_decode($request->getContent(), true); + $content = \json_decode($request->getContent(), flags: JSON_THROW_ON_ERROR); $update = new Update( $content, - $logger ); try { $updateDispatcher->process($update); } catch (\Exception $e) { - if ($this->debug) { + if ($this->debugEnabled) { throw $e; } - $logger->addError('Telegram bot error', [ + $logger->error('Telegram bot error', [ 'exception' => get_class($e), 'file' => $e->getFile(), 'line' => $e->getLine(),