UserResource add seeding leeching data + seed bonus per hour

app/Http/Resources/UserResource.php

@@ -42,11 +42,16 @@ class UserResource extends JsonResource
             'bonus_human' => number_format($this->seedbonus, 1),
             'seed_points' => floatval($this->seed_points),
             'seed_points_human' => number_format($this->seed_points, 1),
+            'seed_points_per_hour' => floatval($this->seed_points_per_hour),
+            'seed_points_per_hour_human' => number_format($this->seed_points_per_hour, 1),
+            'seed_bonus_per_hour' => floatval($this->seed_bonus_per_hour),
+            'seed_bonus_per_hour_human' => number_format($this->seed_bonus_per_hour, 1),
             'seedtime' => $this->seedtime,
             'seedtime_text' => mkprettytime($this->seedtime),
             'leechtime' => $this->leechtime,
             'leechtime_text' => mkprettytime($this->leechtime),
             'share_ratio' => get_ratio($this->id),
+            'seeding_leeching_data' => $this->whenHas('seeding_leeching_data'),
             'inviter' => new UserResource($this->whenLoaded('inviter')),
             'valid_medals' => MedalResource::collection($this->whenLoaded('valid_medals')),
         ];

app/Jobs/CalculateUserSeedBonus.php

@@ -94,7 +94,7 @@ class CalculateUserSeedBonus implements ShouldQueue
         $logFile = getLogFile("seed-bonus-points");
         do_log("$logPrefix, [GET_UID_REAL], count: " . count($results) . ", logFile: $logFile");
         $fd = fopen($logFile, 'a');
-        $seedPointsUpdates = $seedPointsPerHourUpdates = $seedBonusUpdates = [];
+        $seedPointsUpdates = $seedPointsPerHourUpdates = $seedBonusPerHourUpdates = $seedBonusUpdates = [];
         $seedingTorrentCountUpdates = $seedingTorrentSizeUpdates = [];
         $logStr = "";
         $bonusLogInsert = [];
@@ -157,6 +157,7 @@ class CalculateUserSeedBonus implements ShouldQueue
 //            NexusDB::statement($sql);
             $seedPointsUpdates[] = sprintf("when %d then ifnull(seed_points, 0) + %f", $uid, $seed_points);
             $seedPointsPerHourUpdates[] = sprintf("when %d then %f", $uid, $seedBonusResult['seed_points']);
+            $seedBonusPerHourUpdates[] = sprintf("when %d then %f", $uid, $seedBonusResult['seed_bonus']);
             $seedingTorrentCountUpdates[] = sprintf("when %d then %f", $uid, $seedBonusResult['torrent_peer_count']);
             $seedingTorrentSizeUpdates[] = sprintf("when %d then %f", $uid, $seedBonusResult['size']);
             $seedBonusUpdates[] = sprintf("when %d then seedbonus + %f", $uid, $all_bonus);
@@ -175,8 +176,8 @@ class CalculateUserSeedBonus implements ShouldQueue
         }
         $nowStr = now()->toDateTimeString();
         $sql = sprintf(
-            "update users set seed_points = case id %s end, seed_points_per_hour = case id %s end, seedbonus = case id %s end, seeding_torrent_count = case id %s end, seeding_torrent_size = case id %s end, seed_points_updated_at = '%s' where id in (%s)",
+            "update users set seed_points = case id %s end, seed_points_per_hour = case id %s end, seed_bonus_per_hour = case id %s end, seedbonus = case id %s end, seeding_torrent_count = case id %s end, seeding_torrent_size = case id %s end, seed_points_updated_at = '%s' where id in (%s)",
-            implode(" ", $seedPointsUpdates), implode(" ", $seedPointsPerHourUpdates), implode(" ", $seedBonusUpdates), implode(" ", $seedingTorrentCountUpdates), implode(" ", $seedingTorrentSizeUpdates), $nowStr, $idStr
+            implode(" ", $seedPointsUpdates), implode(" ", $seedPointsPerHourUpdates), implode(" ", $seedBonusPerHourUpdates), implode(" ", $seedBonusUpdates), implode(" ", $seedingTorrentCountUpdates), implode(" ", $seedingTorrentSizeUpdates), $nowStr, $idStr
         );
         $result = NexusDB::statement($sql);
         if ($delIdRedisKey) {

app/Repositories/UserRepository.php

@@ -36,6 +36,9 @@ use Nexus\Database\NexusDB;
 
 class UserRepository extends BaseRepository
 {
+    private static array $allowIncludes = ['inviter', 'valid_medals'];
+    private static array $allowIncludeFields = ['seeding_leeching_data'];
+    private static array $allowIncludeCounts = [];
     public function getList(array $params)
     {
         $query = User::query();
@@ -66,28 +69,34 @@ class UserRepository extends BaseRepository
     {
         //query this info default
         $query = User::query()->with([]);
-        $allowIncludes = ['inviter', 'valid_medals'];
-        $allowIncludeCounts = [];
-        $allowIncludeFields = [];
         $apiQueryBuilder = ApiQueryBuilder::for(UserResource::NAME, $query)
-            ->allowIncludes($allowIncludes)
+            ->allowIncludes(self::$allowIncludes)
-            ->allowIncludeCounts($allowIncludeCounts)
+            ->allowIncludeCounts(self::$allowIncludeCounts)
-            ->allowIncludeFields($allowIncludeFields)
+            ->allowIncludeFields(self::$allowIncludeFields)
         ;
         $query = $apiQueryBuilder->build();
         $user = $query->findOrFail($id);
         Gate::authorize('view', $user);
-        return $this->appendIncludeFields($apiQueryBuilder, $currentUser, $user);
+        $userList =  $this->appendIncludeFields($apiQueryBuilder, $currentUser, [$user]);
+        return $userList[0];
     }
 
-    private function appendIncludeFields(ApiQueryBuilder $apiQueryBuilder, Authenticatable $currentUser, User $user): User
+    private function appendIncludeFields(ApiQueryBuilder $apiQueryBuilder, Authenticatable $currentUser, $userList)
     {
-//        $id = $torrent->id;
+        $idArr = [];
-//        if ($apiQueryBuilder->hasIncludeField('has_bookmarked')) {
+        foreach ($userList as $user) {
-//            $torrent->has_bookmarked = (int)$user->bookmarks()->where('torrentid', $id)->exists();;
+            $idArr[] = $user->id;
-//        }
+        }
-
+        if ($hasFieldSeedingData = $apiQueryBuilder->hasIncludeField('seeding_leeching_data')) {
-        return $user;
+            $seedingData = $this->listUserSeedingLeechingData($idArr);
+        }
+        foreach ($userList as $user) {
+            $id = $user->id;
+            if ($hasFieldSeedingData && isset($seedingData[$id])) {
+                $user->seeding_leeching_data = $seedingData[$id];
+            }
+        }
+        return $userList;
     }
 
     /**
@@ -814,4 +823,38 @@ class UserRepository extends BaseRepository
         return $loginLog;
     }
 
+    /**
+     * get user seeding/leeching count and size
+     *
+     * @see calculate_seed_bonus()
+     * @param array $userIdArr
+     * @return array
+     */
+    private function listUserSeedingLeechingData(array $userIdArr)
+    {
+        $minSize = get_setting('bonus.min_size', 0);
+        $idStr = implode(",", $userIdArr);
+        $sql = "select peers.userid, peers.seeder, torrents.size from torrents LEFT JOIN peers ON peers.torrent = torrents.id WHERE peers.userid in ($idStr) and torrents.size > $minSize group by peers.torrent, peers.peer_id, peers.userid, peers.seeder";
+        $data = NexusDB::select($sql);
+        $result = [];
+        foreach ($data as $row) {
+            if (!isset($result[$row['userid']])) {
+                $result[$row['userid']] = [
+                    'seeding_count' => 0,
+                    'seeding_size' => 0,
+                    'leeching_count' => 0,
+                    'leeching_size' => 0,
+                ];
+            }
+            if ($row['seeder'] == 'yes') {
+                $result[$row['userid']]['seeding_count'] += 1;
+                $result[$row['userid']]['seeding_size'] += $row['size'];
+            } else {
+                $result[$row['userid']]['leeching_count'] += 1;
+                $result[$row['userid']]['leeching_size'] += $row['size'];
+            }
+        }
+        return $result;
+    }
+
 }

database/migrations/2025_11_19_033120_add_seeding_bonus_per_hour_to_users_table.php

@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->decimal('seed_bonus_per_hour', 20, 1)->default(0)->after('seed_points_per_hour');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->dropColumn('seed_bonus_per_hour');
+        });
+    }
+};

include/cleanup.php

@@ -341,7 +341,7 @@ function docleanup($forceAll = 0, $printProgress = false) {
 
     //rest seed_points_per_hour
     $seedPointsUpdatedAtMin = $carbonNow->subSeconds(2*intval($autoclean_interval_one))->toDateTimeString();
-    sql_query("update users set seed_points_per_hour = 0 where seed_points_updated_at < " . sqlesc($seedPointsUpdatedAtMin));
+    sql_query("update users set seed_points_per_hour = 0, seed_bonus_per_hour = 0, seeding_torrent_count = 0, seeding_torrent_size = 0 where seed_points_updated_at < " . sqlesc($seedPointsUpdatedAtMin));
 
 	\App\Repositories\CleanupRepository::runBatchJobCalculateUserSeedBonus($requestId);
 

include/constants.php

@@ -1,6 +1,6 @@
 <?php
-defined('VERSION_NUMBER') || define('VERSION_NUMBER', '1.9.11');
+defined('VERSION_NUMBER') || define('VERSION_NUMBER', '1.9.13');
-defined('RELEASE_DATE') || define('RELEASE_DATE', '2025-11-02');
+defined('RELEASE_DATE') || define('RELEASE_DATE', '2025-11-21');
 defined('IN_TRACKER') || define('IN_TRACKER', false);
 defined('PROJECTNAME') || define("PROJECTNAME","NexusPHP");
 defined('NEXUSPHPURL') || define("NEXUSPHPURL","https://nexusphp.org");