lkddi/nexusphp
1
0
Fork 0
mirror of https://github.com/lkddi/nexusphp.git synced 2026-04-03 14:10:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

merge 1.9

Browse Source
This commit is contained in:
xiaomlove
2025-12-29 00:02:46 +07:00
parent c5b55dbda1 eb248110fc
commit 8602831d3a
11 changed files with 123 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/Http/Resources/UserResource.php
View File

@@ -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')),
];

7
app/Jobs/CalculateUserSeedBonus.php
View File

@@ -96,7 +96,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 = [];
@@ -159,6 +159,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);
@@ -177,8 +178,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)",
implode(" ", $seedPointsUpdates), implode(" ", $seedPointsPerHourUpdates), implode(" ", $seedBonusUpdates), implode(" ", $seedingTorrentCountUpdates), implode(" ", $seedingTorrentSizeUpdates), $nowStr, $idStr
"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(" ", $seedBonusPerHourUpdates), implode(" ", $seedBonusUpdates), implode(" ", $seedingTorrentCountUpdates), implode(" ", $seedingTorrentSizeUpdates), $nowStr, $idStr
);
$result = NexusDB::statement($sql);
if ($delIdRedisKey) {

73
app/Repositories/UserRepository.php
View File

@@ -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)
->allowIncludeCounts($allowIncludeCounts)
->allowIncludeFields($allowIncludeFields)
->allowIncludes(self::$allowIncludes)
->allowIncludeCounts(self::$allowIncludeCounts)
->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;
// if ($apiQueryBuilder->hasIncludeField('has_bookmarked')) {
// $torrent->has_bookmarked = (int)$user->bookmarks()->where('torrentid', $id)->exists();;
// }
return $user;
$idArr = [];
foreach ($userList as $user) {
$idArr[] = $user->id;
}
if ($hasFieldSeedingData = $apiQueryBuilder->hasIncludeField('seeding_leeching_data')) {
$seedingData = $this->listUserSeedingLeechingData($idArr);
}
foreach ($userList as $user) {
$id = $user->id;
if ($hasFieldSeedingData && isset($seedingData[$id])) {
$user->seeding_leeching_data = $seedingData[$id];
}
}
return $userList;
}
/**
@@ -259,7 +268,7 @@ class UserRepository extends BaseRepository
private function setEnableLatelyCache(int $userId): void
{
NexusDB::cache_put(User::getUserEnableLatelyCacheKey($userId), now()->toDateTimeString());
NexusDB::cache_put(User::getUserEnableLatelyCacheKey($userId), now()->toDateTimeString(), 86400);
}
public function getInviteInfo($id)
@@ -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;
}
}