From 4df7479d72b28c4568ae6abab6eacbde2fb3336e Mon Sep 17 00:00:00 2001 From: xiaomlove Date: Mon, 21 Feb 2022 21:49:38 +0800 Subject: [PATCH] [api] message order by id desc --- app/Http/Controllers/MessageController.php | 6 +++++- app/Http/Resources/TorrentResource.php | 7 +++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/app/Http/Controllers/MessageController.php b/app/Http/Controllers/MessageController.php index 274567e3..0ddb04a3 100644 --- a/app/Http/Controllers/MessageController.php +++ b/app/Http/Controllers/MessageController.php @@ -18,7 +18,11 @@ class MessageController extends Controller public function index(Request $request) { $user = Auth::user(); - $messages = Message::query()->where('receiver', $user->id)->with(['send_user'])->paginate(); + $messages = Message::query() + ->where('receiver', $user->id) + ->with(['send_user']) + ->orderBy('id', 'desc') + ->paginate(); $resource = MessageResource::collection($messages); return $this->success($resource); diff --git a/app/Http/Resources/TorrentResource.php b/app/Http/Resources/TorrentResource.php index 6f795233..c9dd11e8 100644 --- a/app/Http/Resources/TorrentResource.php +++ b/app/Http/Resources/TorrentResource.php @@ -36,7 +36,8 @@ class TorrentResource extends JsonResource 'user' => new UserResource($this->whenLoaded('user')), 'basic_category' => new CategoryResource($this->whenLoaded('basic_category')), ]; - + $descriptionArr = format_description($this->descr); + $out['cover'] = get_image_from_description($descriptionArr, true); if ($request->routeIs('torrents.show')) { $baseInfo = [ ['label' => nexus_trans('torrent.show.size'), 'value' => mksize($this->size)], @@ -47,7 +48,7 @@ class TorrentResource extends JsonResource } } $out['base_info'] = $baseInfo; - $descriptionArr = format_description($this->descr); + $out['description'] = $descriptionArr; $out['images'] = get_image_from_description($descriptionArr); @@ -55,8 +56,6 @@ class TorrentResource extends JsonResource $out['thank_users_count'] = $this->thank_users_count; $out['peers_count'] = $this->peers_count; } - - $out['cover'] = get_image_from_description(format_description($this->descr), true); // $out['upload_peers_count'] = $this->upload_peers_count; // $out['download_peers_count'] = $this->download_peers_count; // $out['finish_peers_count'] = $this->finish_peers_count;