Merge pull request #1370 from shikorism/develop

Release 2024.12.2
shikorism · Dec 7, 2024 · 6955eb2 · 6955eb2
2 parents dd9ee82 + 25a26d4
commit 6955eb2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/app/User.php b/app/User.php
@@ -111,8 +111,7 @@ public function checkinSummary(): ?array
             ->orderByDesc('ejaculated_date')
             ->first();
         if (!empty($latestEjaculation)) {
-            $currentSession = $latestEjaculation->ejaculated_date
-                ->diffInSeconds(Carbon::now());
+            $currentSession = (int) $latestEjaculation->ejaculated_date->diffInSeconds(Carbon::now());
         } else {
             $currentSession = null;
         }

diff --git a/app/Utilities/ApplyProviderPolicyMiddleware.php b/app/Utilities/ApplyProviderPolicyMiddleware.php
@@ -66,7 +66,7 @@ private function checkProviderPolicy(string $url, ?CarbonInterface $lastAccess)
 
             // 連続アクセス制限
             if ($lastAccess !== null) {
-                $elapsedSeconds = $lastAccess->diffInSeconds(now(), false);
+                $elapsedSeconds = (int) $lastAccess->diffInSeconds(now());
                 if ($elapsedSeconds < $contentProvider->access_interval_sec) {
                     if ($elapsedSeconds < 0) {
                         $wait = abs($elapsedSeconds) + $contentProvider->access_interval_sec;