Merge remote-tracking branch 'refs/remotes/origin/php8' into php8

xiaomlove · Sep 21, 2023 · ea85572 · ea85572
2 parents 095b9f5 + 6895fb4
commit ea85572
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/app/Models/HitAndRun.php b/app/Models/HitAndRun.php
@@ -62,17 +62,18 @@ private function doGetInspectTimeLeft(): string
         if ($this->status != self::STATUS_INSPECTING) {
             return '---';
         }
-        if (!$this->snatch->completedat) {
-            //not download completed
-            return '---';
-        }
+        //change to use create time
+//        if (!$this->snatch->completedat) {
+//            //not download completed
+//            return '---';
+//        }
         $searchBoxId = $this->torrent->basic_category->mode ?? 0;
         if ($searchBoxId == 0) {
             do_log(sprintf('[INVALID_CATEGORY], Torrent: %s', $this->torrent_id), 'error');
             return '---';
         }
         $inspectTime = HitAndRun::getConfig('inspect_time', $searchBoxId);
-        $diffInSeconds = Carbon::now()->diffInSeconds($this->snatch->completedat->addHours($inspectTime));
+        $diffInSeconds = Carbon::now()->diffInSeconds($this->created_at->addHours($inspectTime));
         return mkprettytime($diffInSeconds);
     }
 

diff --git a/public/announce.php b/public/announce.php
@@ -607,7 +607,7 @@
 }
 
 //handle hr
-if ($az['class'] < \App\Models\HitAndRun::MINIMUM_IGNORE_USER_CLASS && !$isDonor && isset($torrent['mode'])) {
+if (($left > 0 || $event == "completed") && $az['class'] < \App\Models\HitAndRun::MINIMUM_IGNORE_USER_CLASS && !$isDonor && isset($torrent['mode'])) {
     $hrMode = \App\Models\HitAndRun::getConfig('mode', $torrent['mode']);
     $hrLog = sprintf("[HR_LOG] user: %d, torrent: %d, hrMode: %s", $userid, $torrentid, $hrMode);
     if ($hrMode == \App\Models\HitAndRun::MODE_GLOBAL || ($hrMode == \App\Models\HitAndRun::MODE_MANUAL && $torrent['hr'] == \App\Models\Torrent::HR_YES)) {
@@ -628,7 +628,11 @@
             $snatchInfo = get_snatch_info($torrentid, $userid);
             $requiredDownloaded = $torrent['size'] * $includeRate;
             if ($snatchInfo['downloaded'] >= $requiredDownloaded) {
-                $sql = "insert into hit_and_runs (uid, torrent_id, snatched_id) values ($userid, $torrentid, {$snatchInfo['id']}) on duplicate key update updated_at = " . sqlesc(date('Y-m-d H:i:s'));
+                $nowStr = date('Y-m-d H:i:s');
+                $sql = sprintf(
+                    "insert into hit_and_runs (uid, torrent_id, snatched_id, created_at, updated_at) values (%d, %d, %d, '%s', '%s') on duplicate key update created_at = '%s', updated_at = '%s'",
+                    $userid, $torrentid, $snatchInfo['id'], $nowStr, $nowStr, $nowStr, $nowStr
+                );
                 $affectedRows = sql_query($sql);
                 do_log("$hrLog, total downloaded: {$snatchInfo['downloaded']} >= required: $requiredDownloaded, [INSERT_H&R], sql: $sql, affectedRows: $affectedRows");
             } else {