judge H&R count think about section

This commit is contained in:
xiaomlove
2022-10-01 01:58:18 +08:00
parent 6de5cb2f21
commit 28b85c7ecf
5 changed files with 14 additions and 7 deletions

View File

@@ -44,8 +44,8 @@ class HitAndRunUpdateStatus extends Command
$rep = new HitAndRunRepository();
$result = $rep->cronjobUpdateStatus($uid, $torrentId, $ignoreTime);
$log = sprintf(
'[%s], %s, uid: %s, torrentId: %s, result: %s',
nexus()->getRequestId(), __METHOD__, $uid, $torrentId, var_export($result, true)
'[%s], %s, uid: %s, torrentId: %s, ignoreTime: %s, result: %s',
nexus()->getRequestId(), __METHOD__, $uid, $torrentId, $ignoreTime, var_export($result, true)
);
$this->info($log);
do_log($log);

View File

@@ -89,8 +89,10 @@ class Test extends Command
*/
public function handle()
{
$r = strstr('hr.*', '.', true);
dd($r);
$rep = new \NexusPlugin\HitAndRun\HitAndRunRepository();
$rep->initSectionHitAndRunSetting(SearchBox::SECTION_BROWSE . "_");
$rep->initSectionHitAndRunSetting(SearchBox::SECTION_SPECIAL . "_");
clear_setting_cache();
}

View File

@@ -72,7 +72,7 @@ class HitAndRunResource extends Resource
public static function getEloquentQuery(): Builder
{
return parent::getEloquentQuery()->with(['user', 'torrent', 'snatch']);
return parent::getEloquentQuery()->with(['user', 'torrent', 'snatch', 'torrent.basic_category']);
}
public static function getRelations(): array

View File

@@ -335,7 +335,12 @@ class HitAndRunRepository extends BaseRepository
//disable user
/** @var User $user */
$user = $hitAndRun->user;
$counts = $user->hitAndRuns()->where('status', HitAndRun::STATUS_UNREACHED)->count();
$counts = $user->hitAndRuns()
->where('status', HitAndRun::STATUS_UNREACHED)
->whereHas('torrent.basic_category', function (Builder $query) use ($searchBoxId) {
return $query->where('mode', $searchBoxId);
})
->count();
$disableCounts = HitAndRun::getConfig('ban_user_when_counts_reach', $searchBoxId);
do_log("user: {$user->id}, H&R counts: $counts, disableCounts: $disableCounts", 'notice');
if ($counts >= $disableCounts) {

View File

@@ -971,7 +971,7 @@ function clear_user_cache($uid, $passkey = '')
}
}
function clear_setting_cache($buildPermissionCache = false)
function clear_setting_cache()
{
\Nexus\Database\NexusDB::cache_del('nexus_settings_in_laravel');
\Nexus\Database\NexusDB::cache_del('nexus_settings_in_nexus');