diff --git a/app/Http/Middleware/ThrottleRequestsWithPredis.php b/app/Http/Middleware/ThrottleRequestsWithPredis.php index 365cdad192..30388163d1 100644 --- a/app/Http/Middleware/ThrottleRequestsWithPredis.php +++ b/app/Http/Middleware/ThrottleRequestsWithPredis.php @@ -4,15 +4,15 @@ namespace App\Http\Middleware; use Closure; use Illuminate\Cache\RateLimiter; +use Illuminate\Contracts\Redis\Factory as Redis; use Illuminate\Redis\Limiters\DurationLimiter; -use Illuminate\Routing\Middleware\ThrottleRequests; -class ThrottleRequestsWithPredis extends ThrottleRequests +class ThrottleRequestsWithPredis extends \Illuminate\Routing\Middleware\ThrottleRequests { /** * The Redis factory implementation. * - * @var \Illuminate\Redis\Connections\Connection + * @var \Illuminate\Contracts\Redis\Factory */ protected $redis; @@ -34,13 +34,17 @@ class ThrottleRequestsWithPredis extends ThrottleRequests * Create a new request throttler. * * @param \Illuminate\Cache\RateLimiter $limiter + * @param \Illuminate\Contracts\Redis\Factory $redis * @return void */ - public function __construct(RateLimiter $limiter) + public function __construct(RateLimiter $limiter, Redis $redis) { parent::__construct($limiter); $this->redis = \Illuminate\Support\Facades\Redis::connection('sentinel-cache'); + + // $this->redis = $redis; + } /** @@ -56,7 +60,7 @@ class ThrottleRequestsWithPredis extends ThrottleRequests protected function handleRequest($request, Closure $next, array $limits) { foreach ($limits as $limit) { - if ($this->tooManyAttempts($limit->key, $limit->maxAttempts, $limit->decayMinutes)) { + if ($this->tooManyAttempts($limit->key, $limit->maxAttempts, $limit->decaySeconds)) { throw $this->buildException($request, $limit->key, $limit->maxAttempts, $limit->responseCallback); } } @@ -79,16 +83,13 @@ class ThrottleRequestsWithPredis extends ThrottleRequests * * @param string $key * @param int $maxAttempts - * @param int $decayMinutes + * @param int $decaySeconds * @return mixed */ - protected function tooManyAttempts($key, $maxAttempts, $decayMinutes) + protected function tooManyAttempts($key, $maxAttempts, $decaySeconds) { $limiter = new DurationLimiter( - $this->redis, - $key, - $maxAttempts, - $decayMinutes * 60 + $this->getRedisConnection(), $key, $maxAttempts, $decaySeconds ); return tap(! $limiter->acquire(), function () use ($key, $limiter) { @@ -121,4 +122,14 @@ class ThrottleRequestsWithPredis extends ThrottleRequests { return $this->decaysAt[$key] - $this->currentTime(); } + + /** + * Get the Redis connection that should be used for throttling. + * + * @return \Illuminate\Redis\Connections\Connection + */ + protected function getRedisConnection() + { + return $this->redis; + } } diff --git a/app/Jobs/RecurringInvoice/SendRecurring.php b/app/Jobs/RecurringInvoice/SendRecurring.php index a856539a64..6874e2e980 100644 --- a/app/Jobs/RecurringInvoice/SendRecurring.php +++ b/app/Jobs/RecurringInvoice/SendRecurring.php @@ -176,8 +176,8 @@ class SendRecurring implements ShouldQueue private function createRecurringInvitations($invoice): Invoice { if ($this->recurring_invoice->invitations->count() == 0) { - $this->recurring_invoice->service()->createInvitations()->save(); - $this->recurring_invoice = $this->recurring_invoice->fresh(); + $this->recurring_invoice = $this->recurring_invoice->service()->createInvitations()->save(); + // $this->recurring_invoice = $this->recurring_invoice->fresh(); } $this->recurring_invoice->invitations->each(function ($recurring_invitation) use ($invoice) { diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php index 8b447788b7..4a86a210f6 100644 --- a/app/Providers/RouteServiceProvider.php +++ b/app/Providers/RouteServiceProvider.php @@ -11,17 +11,16 @@ namespace App\Providers; -use App\Http\Middleware\ThrottleRequestsWithPredis; -use App\Models\Scheduler; use App\Utils\Ninja; +use App\Models\Scheduler; +use Illuminate\Http\Request; use App\Utils\Traits\MakesHash; +use Illuminate\Support\Facades\Route; use Illuminate\Cache\RateLimiting\Limit; +use Illuminate\Support\Facades\RateLimiter; +use App\Http\Middleware\ThrottleRequestsWithPredis; use Illuminate\Database\Eloquent\ModelNotFoundException as ModelNotFoundException; use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider; -use Illuminate\Http\Request; -use Illuminate\Routing\Middleware\ThrottleRequests; -use Illuminate\Support\Facades\RateLimiter; -use Illuminate\Support\Facades\Route; class RouteServiceProvider extends ServiceProvider { @@ -36,11 +35,11 @@ class RouteServiceProvider extends ServiceProvider { parent::boot(); - if (Ninja::isHosted() && !config('ninja.testvars.travis')) { + // if (Ninja::isHosted() && !config('ninja.testvars.travis')) { app('router')->aliasMiddleware('throttle', ThrottleRequestsWithPredis::class); - } else { - app('router')->aliasMiddleware('throttle', ThrottleRequests::class); - } + // } else { + // app('router')->aliasMiddleware('throttle', ThrottleRequests::class); + // } Route::bind('task_scheduler', function ($value) { if (is_numeric($value)) { diff --git a/app/Services/Template/TemplateService.php b/app/Services/Template/TemplateService.php index 6e945840ed..c511409993 100644 --- a/app/Services/Template/TemplateService.php +++ b/app/Services/Template/TemplateService.php @@ -482,7 +482,7 @@ class TemplateService default => $processed = [], }; - nlog(json_encode($processed)); + // nlog(json_encode($processed)); return $processed; diff --git a/composer.lock b/composer.lock index c5427c1227..e194aaba1e 100644 --- a/composer.lock +++ b/composer.lock @@ -16665,23 +16665,23 @@ }, { "name": "nunomaduro/collision", - "version": "v8.3.0", + "version": "v8.4.0", "source": { "type": "git", "url": "https://github.com/nunomaduro/collision.git", - "reference": "b49f5b2891ce52726adfd162841c69d4e4c84229" + "reference": "e7d1aa8ed753f63fa816932bbc89678238843b4a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nunomaduro/collision/zipball/b49f5b2891ce52726adfd162841c69d4e4c84229", - "reference": "b49f5b2891ce52726adfd162841c69d4e4c84229", + "url": "https://api.github.com/repos/nunomaduro/collision/zipball/e7d1aa8ed753f63fa816932bbc89678238843b4a", + "reference": "e7d1aa8ed753f63fa816932bbc89678238843b4a", "shasum": "" }, "require": { "filp/whoops": "^2.15.4", "nunomaduro/termwind": "^2.0.1", "php": "^8.2.0", - "symfony/console": "^7.1.2" + "symfony/console": "^7.1.3" }, "conflict": { "laravel/framework": "<11.0.0 || >=12.0.0", @@ -16689,13 +16689,13 @@ }, "require-dev": { "larastan/larastan": "^2.9.8", - "laravel/framework": "^11.16.0", - "laravel/pint": "^1.16.2", - "laravel/sail": "^1.30.2", + "laravel/framework": "^11.19.0", + "laravel/pint": "^1.17.1", + "laravel/sail": "^1.31.0", "laravel/sanctum": "^4.0.2", "laravel/tinker": "^2.9.0", - "orchestra/testbench-core": "^9.2.1", - "pestphp/pest": "^2.34.9 || ^3.0.0", + "orchestra/testbench-core": "^9.2.3", + "pestphp/pest": "^2.35.0 || ^3.0.0", "sebastian/environment": "^6.1.0 || ^7.0.0" }, "type": "library", @@ -16758,7 +16758,7 @@ "type": "patreon" } ], - "time": "2024-07-16T22:41:01+00:00" + "time": "2024-08-03T15:32:23+00:00" }, { "name": "phar-io/manifest",