api remove page title etc

This commit is contained in:
xiaomlove
2023-06-10 04:25:07 +08:00
parent f153b9ab9c
commit 8e156dcbea
11 changed files with 52 additions and 51 deletions

View File

@@ -32,9 +32,9 @@ class CommentController extends Controller
->where('torrent', $torrentId)
->paginate();
$resource = CommentResource::collection($comments);
$resource->additional([
'page_title' => nexus_trans('comment.index.page_title'),
]);
// $resource->additional([
// 'page_title' => nexus_trans('comment.index.page_title'),
// ]);
return $this->success($resource);
}

View File

@@ -19,9 +19,9 @@ class FileController extends Controller
$torrentId = $request->torrent_id;
$files = File::query()->where('torrent', $torrentId)->get();
$resource = FileResource::collection($files);
$resource->additional([
'page_title' => nexus_trans('file.index.page_title'),
]);
// $resource->additional([
// 'page_title' => nexus_trans('file.index.page_title'),
// ]);
return $this->success($resource);
}

View File

@@ -53,9 +53,9 @@ class MessageController extends Controller
$message = Message::query()->with(['send_user'])->findOrFail($id);
$message->update(['unread' => 'no']);
$resource = new MessageResource($message);
$resource->additional([
'page_title' => nexus_trans('message.show.page_title'),
]);
// $resource->additional([
// 'page_title' => nexus_trans('message.show.page_title'),
// ]);
return $this->success($resource);
}
@@ -93,9 +93,9 @@ class MessageController extends Controller
$messages = $query->paginate();
$resource = MessageResource::collection($messages);
$resource->additional([
'site_info' => site_info(),
]);
// $resource->additional([
// 'site_info' => site_info(),
// ]);
return $this->success($resource);
}

View File

@@ -31,8 +31,8 @@ class PeerController extends Controller
$response = [
'seeder_list' => [],
'leecher_list' => [],
'card_titles' => Peer::$cardTitles,
'page_title' => nexus_trans('peer.index.page_title'),
// 'card_titles' => Peer::$cardTitles,
// 'page_title' => nexus_trans('peer.index.page_title'),
];
$result = $this->repository->listPeers($request->torrent_id);
if ($result['seeder_list']->isNotEmpty()) {

View File

@@ -14,9 +14,9 @@ class PollController extends Controller
{
private $repository;
public function __construct()
public function __construct(PollRepository $repository)
{
$this->repository = $repository;
}
private function getRules(): array

View File

@@ -28,10 +28,10 @@ class SnatchController extends Controller
]);
$snatches = $this->repository->listSnatches($request->torrent_id);
$resource = SnatchResource::collection($snatches);
$resource->additional([
'card_titles' => Snatch::$cardTitles,
'page_title' => nexus_trans('snatch.index.page_title'),
]);
// $resource->additional([
// 'card_titles' => Snatch::$cardTitles,
// 'page_title' => nexus_trans('snatch.index.page_title'),
// ]);
return $this->success($resource);
}

View File

@@ -27,9 +27,9 @@ class ThankController extends Controller
->with(['user'])
->paginate();
$resource = ThankResource::collection($thanks);
$resource->additional([
'page_title' => nexus_trans('thank.index.page_title'),
]);
// $resource->additional([
// 'page_title' => nexus_trans('thank.index.page_title'),
// ]);
return $this->success($resource);
}

View File

@@ -30,9 +30,9 @@ class TorrentController extends Controller
$params['category_mode'] = Setting::get('main.browsecat');
$result = $this->repository->getList($params, Auth::user());
$resource = TorrentResource::collection($result);
$resource->additional([
'page_title' => nexus_trans('torrent.index.page_title'),
]);
// $resource->additional([
// 'page_title' => nexus_trans('torrent.index.page_title'),
// ]);
return $this->success($resource);
}
@@ -65,8 +65,8 @@ class TorrentController extends Controller
$resource = new TorrentResource($result);
$resource->additional([
'page_title' => nexus_trans('torrent.show.page_title'),
'field_labels' => Torrent::getFieldLabels(),
// 'page_title' => nexus_trans('torrent.show.page_title'),
// 'field_labels' => Torrent::getFieldLabels(),
'is_bookmarked' => (int)$isBookmarked,
'bonus_reward_values' => Torrent::BONUS_REWARD_VALUES,
]);

View File

@@ -173,23 +173,23 @@ class UserController extends Controller
$user = Auth::user();
$resource = $this->getUserProfile($user->id);
$rows = [
[
['icon' => 'icon-user', 'label' => '种子评论', 'name' => 'comments_count'],
['icon' => 'icon-user', 'label' => '论坛帖子', 'name' => 'posts_count'],
],[
['icon' => 'icon-user', 'label' => '发布种子', 'name' => 'torrents_count'],
['icon' => 'icon-user', 'label' => '当前做种', 'name' => 'seeding_torrents_count'],
['icon' => 'icon-user', 'label' => '当前下载', 'name' => 'leeching_torrents_count'],
['icon' => 'icon-user', 'label' => '完成种子', 'name' => 'completed_torrents_count'],
['icon' => 'icon-user', 'label' => '未完成种子', 'name' => 'incomplete_torrents_count'],
]
];
$resource->additional([
'card_titles' => User::$cardTitles,
'rows' => $rows
]);
//
// $rows = [
// [
// ['icon' => 'icon-user', 'label' => '种子评论', 'name' => 'comments_count'],
// ['icon' => 'icon-user', 'label' => '论坛帖子', 'name' => 'posts_count'],
// ],[
// ['icon' => 'icon-user', 'label' => '发布种子', 'name' => 'torrents_count'],
// ['icon' => 'icon-user', 'label' => '当前做种', 'name' => 'seeding_torrents_count'],
// ['icon' => 'icon-user', 'label' => '当前下载', 'name' => 'leeching_torrents_count'],
// ['icon' => 'icon-user', 'label' => '完成种子', 'name' => 'completed_torrents_count'],
// ['icon' => 'icon-user', 'label' => '未完成种子', 'name' => 'incomplete_torrents_count'],
// ]
// ];
// $resource->additional([
// 'card_titles' => User::$cardTitles,
// 'rows' => $rows
// ]);
return $this->success($resource);
}

View File

@@ -343,13 +343,15 @@ class TorrentRepository extends BaseRepository
private function getEncryptDownHashKey($user)
{
if ($user instanceof User) {
$user = $user->toArray();
}
if (!is_array($user) || empty($user['passkey']) || empty($user['id'])) {
$user = User::query()->findOrFail(intval($user), ['id', 'passkey'])->toArray();
$passkey = $user->passkey;
} elseif (!is_array($user) || empty($user['passkey']) || empty($user['id'])) {
$user = User::query()->findOrFail(intval($user), ['id', 'passkey']);
$passkey = $user->passkey;
} else {
$passkey = $user['passkey'];
}
//down hash is relative to user passkey
return md5($user['passkey'] . date('Ymd') . $user['id']);
return md5($passkey . date('Ymd') . $user['id']);
}
public function getTrackerReportAuthKey($id, $uid, $initializeIfNotExists = false): string

View File

@@ -37,7 +37,6 @@ Route::group(['middleware' => ['auth:sanctum', 'locale']], function () {
Route::get('search-box', [\App\Http\Controllers\TorrentController::class, 'searchBox']);
Route::resource('news', \App\Http\Controllers\NewsController::class);
Route::get('attend', [\App\Http\Controllers\AttendanceController::class, 'attend']);
Route::resource('news', \App\Http\Controllers\NewsController::class);
Route::get('news-latest', [\App\Http\Controllers\NewsController::class, 'latest']);
Route::resource('polls', \App\Http\Controllers\PollController::class);
Route::get('polls-latest', [\App\Http\Controllers\PollController::class, 'latest']);