improve claim settle message

app/Console/Commands/ClaimSettle.php

@@ -40,8 +40,8 @@ class ClaimSettle extends Command
     {
         $rep = new ClaimRepository();
         $uid = $this->option('uid');
-        $force = $this->option('force');
+        $force = $this->option('force') ?? false;
-        $test = $this->option('test');
+        $test = $this->option('test') ?? false;
         $this->info(sprintf('uid: %s, force: %s, test: %s', $uid, $force, $test));
         if (!$uid) {
             $result = $rep->settleCronjob();

app/Console/Commands/Test.php

@@ -9,6 +9,7 @@ use App\Models\PersonalAccessToken;
 use App\Models\Torrent;
 use App\Models\TorrentExtra;
 use App\Models\User;
+use App\Repositories\ClaimRepository;
 use App\Repositories\ExamRepository;
 use App\Repositories\SeedBoxRepository;
 use App\Repositories\UploadRepository;

app/Repositories/ClaimRepository.php

@@ -311,10 +311,16 @@ class ClaimRepository extends BaseRepository
         $msg[] = nexus_trans('claim.claim_total', [ 'total' => count($allTorrentIdArr)], $locale);
 
         //列表数据只取部分展示
-        $reachList = collect(array_slice($reachedTorrentIdArr, 0, self::SETTLE_MSG_SLICE_COUNT))->map(
+        $sliceCount = self::SETTLE_MSG_SLICE_COUNT;
-            fn($item) => sprintf("[url=details.php?id=%s]%s[/url]", $item, $torrentInfo->get($item)->name)
+        $sliceTip = "... (" . nexus_trans('claim.slice_tip', ['slice_count' => $sliceCount], $locale) . ")";
-        )->implode("\n");
+        $reachPart = nexus_trans("claim.claim_reached_counts", ['counts' => count($reachedTorrentIdArr), 'slice_count' => $sliceCount], $locale);
-        $msg[] = nexus_trans("claim.claim_reached_counts", ['counts' => count($reachedTorrentIdArr)], $locale) . "\n$reachList";
+        if (!empty($reachedTorrentIdArr)) {
+            $reachList = collect(array_slice($reachedTorrentIdArr, 0, $sliceCount))->map(
+                fn($item) => sprintf("[url=details.php?id=%s]%s[/url]", $item, $torrentInfo->get($item)->name)
+            )->implode("\n");
+            $reachPart .= sprintf("\n%s\n%s", $reachList, $sliceTip);
+        }
+        $msg[] = $reachPart;
         $msg[] = nexus_trans(
             "claim.claim_reached_summary", [
                 'bonus_per_hour' => number_format($bonusResult['seed_bonus'], 2),
@@ -323,15 +329,24 @@ class ClaimRepository extends BaseRepository
             ], $locale
         );
 
-        $remainList = collect(array_slice($remainTorrentIdArr, 0, self::SETTLE_MSG_SLICE_COUNT))->map(
+        $remainPart = nexus_trans("claim.claim_unreached_remain_counts", ['counts' => count($remainTorrentIdArr), 'slice_count' => $sliceCount], $locale);
-            fn($item) => sprintf("[url=details.php?id=%s]%s[/url]", $item, $torrentInfo->get($item)->name)
+        if (!empty($remainTorrentIdArr)) {
-        )->implode("\n");
+            $remainList = collect(array_slice($remainTorrentIdArr, 0, $sliceCount))->map(
-        $msg[] = nexus_trans("claim.claim_unreached_remain_counts", ['counts' => count($remainTorrentIdArr)], $locale) . "\n$remainList";
+                fn($item) => sprintf("[url=details.php?id=%s]%s[/url]", $item, $torrentInfo->get($item)->name)
+            )->implode("\n");
+            $remainPart .= sprintf("\n%s\n%s", $remainList, $sliceTip);
+        }
+        $msg[] = $remainPart;
+
+        $removePart = nexus_trans("claim.claim_unreached_remove_counts", ['counts' => count($unReachedTorrentIdArr), 'slice_count' => $sliceCount], $locale);
+        if (!empty($unReachedTorrentIdArr)) {
+            $unReachList = collect(array_slice($unReachedTorrentIdArr, 0, $sliceCount))->map(
+                fn($item) => sprintf("[url=details.php?id=%s]%s[/url]", $item, $torrentInfo->get($item)->name)
+            )->implode("\n");
+            $removePart .= sprintf("\n%s\n%s", $unReachList, $sliceTip);
+        }
+        $msg[] = $removePart;
 
-        $unReachList = collect(array_slice($unReachedTorrentIdArr, 0, self::SETTLE_MSG_SLICE_COUNT))->map(
-            fn($item) => sprintf("[url=details.php?id=%s]%s[/url]", $item, $torrentInfo->get($item)->name)
-        )->implode("\n");
-        $msg[] = nexus_trans("claim.claim_unreached_remove_counts", ['counts' => count($unReachedTorrentIdArr)], $locale) . "\n$unReachList";
         if ($deductTotal) {
             $msg[] = nexus_trans(
                 "claim.claim_unreached_summary", [

nexus/Torrent/Torrent.php

@@ -56,12 +56,6 @@ class Torrent
         return $snatchedList;
     }
 
-    public function listPTGenInfo(array $torrentIdArr)
-    {
-        $list = TorrentExtra::query()->whereIn('torrent_id', $torrentIdArr)->get(['torrent_id', 'pt_gen']);
-    }
-
-
     public function renderProgressBar($activeStatus, $progress): string
     {
         $color = '#aaa';

resources/lang/en/claim.php

@@ -23,6 +23,7 @@ return [
     'claim_unreached_remain_counts' => 'Unreached torrent remain counts: [b]:counts[/b]',
     'claim_unreached_remove_counts' => 'Unreached torrent remove counts: [b]:counts[/b]',
     'claim_unreached_summary' => 'Deduct bonus every unreached torrent：[b]:deduct_per_torrent[/b], total deduct: [b]:deduct_total[/b]',
+    'slice_tip' => 'Show only the first :slice_count items',
 
     'confirm_give_up' => 'Are you sure you want to give up claiming this torrent?',
     'add_claim' => 'Claim',

resources/lang/zh_CN/claim.php

@@ -23,6 +23,7 @@ return [
     'claim_unreached_remain_counts' => '未达标保留数：[b]:counts[/b]',
     'claim_unreached_remove_counts' => '未达标删除数：[b]:counts[/b]',
     'claim_unreached_summary' => '未达标每个种子扣除魔力：[b]:deduct_per_torrent[/b]，总扣除魔力：[b]:deduct_total[/b]',
+    'slice_tip' => '只显示前 :slice_count 个',
 
     'confirm_give_up' => '确定要放弃认领此种子吗？',
     'add_claim' => '认领',

resources/lang/zh_TW/claim.php

@@ -22,6 +22,7 @@ return [
     'claim_unreached_remain_counts' => '未達標保留數：[b]:counts[/b]',
     'claim_unreached_remove_counts' => '未達標刪除數：[b]:counts[/b]',
     'claim_unreached_summary' => '未達標每個種子扣除魔力：[b]:deduct_per_torrent[/b]，總扣除魔力：[b]:deduct_total[/b]',
+    'slice_tip' => '只顯示前 :slice_count 個',
 
     'confirm_give_up' => '確定要放棄認領此種子嗎？',
     'add_claim' => '認領',