From 9904198c850a606bdb82600a63e6c56452c922e0 Mon Sep 17 00:00:00 2001 From: Luca Patera Date: Wed, 6 Sep 2023 21:54:35 +0200 Subject: [PATCH] Fix for Laravel Octane --- src/NutgramServiceProvider.php | 8 +++----- src/RunningMode/LaravelWebhook.php | 13 +++++++++++++ 2 files changed, 16 insertions(+), 5 deletions(-) create mode 100644 src/RunningMode/LaravelWebhook.php diff --git a/src/NutgramServiceProvider.php b/src/NutgramServiceProvider.php index 8c0620c..00ca704 100644 --- a/src/NutgramServiceProvider.php +++ b/src/NutgramServiceProvider.php @@ -5,13 +5,11 @@ use Illuminate\Contracts\Cache\Repository as Cache; use Illuminate\Contracts\Foundation\Application; use Illuminate\Support\ServiceProvider; -use Nutgram\Laravel\Console; -use Nutgram\Laravel\Mixins; +use Nutgram\Laravel\RunningMode\LaravelWebhook; use Psr\Log\LoggerInterface; use SergiX44\Nutgram\Configuration; use SergiX44\Nutgram\Nutgram; use SergiX44\Nutgram\RunningMode\Polling; -use SergiX44\Nutgram\RunningMode\Webhook; use SergiX44\Nutgram\Telegram\Types\Media\File; use SergiX44\Nutgram\Testing\FakeNutgram; @@ -57,10 +55,10 @@ public function register() if ($app->runningInConsole()) { $bot->setRunningMode(Polling::class); } else { - $webhook = Webhook::class; + $webhook = LaravelWebhook::class; if (config('nutgram.safe_mode', false)) { // take into account the trust proxy Laravel configuration - $webhook = new Webhook(fn () => $app->make('request')?->ip()); + $webhook = new LaravelWebhook(fn () => $app->make('request')?->ip()); } $bot->setRunningMode($webhook); diff --git a/src/RunningMode/LaravelWebhook.php b/src/RunningMode/LaravelWebhook.php new file mode 100644 index 0000000..639ea8f --- /dev/null +++ b/src/RunningMode/LaravelWebhook.php @@ -0,0 +1,13 @@ +getContent(); + } +}