lkddi/nexusphp
1
0
Fork 0
mirror of https://github.com/lkddi/nexusphp.git synced 2026-04-16 05:50:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix H&R unreach disable user duplicate

Browse Source
This commit is contained in:
xiaomlove
2022-05-01 21:15:00 +08:00
parent 95af63e89a
commit 4593e9ce3c
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/Repositories/HitAndRunRepository.php
View File

@@ -95,6 +95,7 @@ class HitAndRunRepository extends BaseRepository
$query->where('created_at', '<', Carbon::now()->subHours($setting['inspect_time']));
}
$successCounts = 0;
$disabledUsers = [];
while (true) {
$logPrefix = "page: $page, size: $size";
$rows = $query->forPage($page, $size)->get();
@@ -154,9 +155,10 @@ class HitAndRunRepository extends BaseRepository
//unreached
if ($row->created_at->addHours($setting['inspect_time'])->lte(Carbon::now())) {
$result = $this->unreached($row);
$result = $this->unreached($row, !isset($disabledUsers[$row->uid]));
if ($result) {
$successCounts++;
$disabledUsers[$row->uid] = true;
}
}
}
@@ -239,10 +241,9 @@ class HitAndRunRepository extends BaseRepository
return true;
}
private function unreached(HitAndRun $hitAndRun): bool
private function unreached(HitAndRun $hitAndRun, $disableUser = true): bool
{
do_log(__METHOD__);
do_log(sprintf('hitAndRun: %s, disableUser: %s', $hitAndRun->toJson(), var_export($disableUser, true)));
$comment = nexus_trans('hr.unreached_comment', [
'now' => Carbon::now()->toDateTimeString(),
'seed_time' => bcdiv($hitAndRun->snatch->seedtime, 3600, 1),
@@ -276,6 +277,10 @@ class HitAndRunRepository extends BaseRepository
];
Message::query()->insert($message);
if (!$disableUser) {
do_log("[DO_NOT_DISABLE_USER], return");
return true;
}
//disable user
/** @var User $user */
$user = $hitAndRun->user;

2
app/Repositories/TagRepository.php
View File

@@ -72,7 +72,7 @@ class TagRepository extends BaseRepository
$value->color, $value->font_color, $value->border_radius, $value->font_size, $value->margin, $value->padding, $value->name
);
if ($withFilterLink) {
$html .= sprintf('<a href="torrents.php?tag_id=%s">%s</a>', $tagId, $item);
$html .= sprintf('<a href="?tag_id=%s">%s</a>', $tagId, $item);
} else {
$html .= $item;
}