fix bookmark

xiaomlove · Aug 14, 2023 · 8dc9cb8 · 8dc9cb8
1 parent 22b23c4
commit 8dc9cb8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/app/Repositories/ClaimRepository.php b/app/Repositories/ClaimRepository.php
@@ -304,8 +304,9 @@ private function buildMessage(
     ) {
         $now = Carbon::now();
         $allTorrentIdArr = array_merge($reachedTorrentIdArr, $unReachedTorrentIdArr, $remainTorrentIdArr);
+        //这里不使用占位符，在 $allTorrentIdArr 过大（超过3000）时容易结果为空且不报异常
         $torrentInfo = Torrent::query()
-            ->whereIn('id', $allTorrentIdArr)
+            ->whereRaw(sprintf("id in (%s)", implode(',', $allTorrentIdArr)))
             ->get(Torrent::$commentFields)
             ->keyBy('id')
         ;

diff --git a/include/constants.php b/include/constants.php
@@ -1,6 +1,6 @@
 <?php
 defined('VERSION_NUMBER') || define('VERSION_NUMBER', '1.8.6');
-defined('RELEASE_DATE') || define('RELEASE_DATE', '2023-08-04');
+defined('RELEASE_DATE') || define('RELEASE_DATE', '2023-08-15');
 defined('IN_TRACKER') || define('IN_TRACKER', false);
 defined('PROJECTNAME') || define("PROJECTNAME","NexusPHP");
 defined('NEXUSPHPURL') || define("NEXUSPHPURL","https://nexusphp.org");

diff --git a/public/torrents.php b/public/torrents.php
@@ -645,7 +645,8 @@
 }
 //stderr("", count($wherecatina)."-". count($wheresourceina));
 $wherecatin = $wheresourcein = $wheremediumin = $wherecodecin = $wherestandardin = $whereprocessingin = $whereteamin = $whereaudiocodecin = '';
-if (empty($wherecatina)) {
+if (empty($wherecatina) && !(in_array($inclbookmarked, [1, 2]) && $allsec == 1)) {
+    //require limit in some category
     $wherecatina = $allCategoryId;
 }
 if (count($wherecatina) > 1)