diff --git a/app/Http/Controllers/SkinlibController.php b/app/Http/Controllers/SkinlibController.php index dd416d4d..4cbd4ee4 100644 --- a/app/Http/Controllers/SkinlibController.php +++ b/app/Http/Controllers/SkinlibController.php @@ -96,21 +96,12 @@ class SkinlibController extends Controller $totalPages = ceil($query->count() / $itemsPerPage); - // Available sorting methods: time $sort = $request->input('sort', 'time'); $sortBy = ($sort == 'time') ? 'upload_at' : $sort; - // `likes` property is not actually existed in database. - if ($sortBy != 'likes') { - $query = $query->orderBy($sortBy, 'desc'); - } + $query->withCount('likers as likes'); + $query = $query->orderBy($sortBy, 'desc'); - $textures = $query->skip(($currentPage - 1) * $itemsPerPage) - ->take($itemsPerPage) - ->get(); - - if ($sortBy == 'likes') { - $textures = $textures->sortByDesc('likes')->values(); - } + $textures = $query->skip(($currentPage - 1) * $itemsPerPage)->take($itemsPerPage)->get(); if ($user) { $closet = $user->closet()->get(); diff --git a/resources/misc/changelogs/en/4.1.4.md b/resources/misc/changelogs/en/4.1.4.md index 0ba201a2..1c35d369 100644 --- a/resources/misc/changelogs/en/4.1.4.md +++ b/resources/misc/changelogs/en/4.1.4.md @@ -2,3 +2,4 @@ - Fixed dropdown menu of skin library for mobile users. - Fixed previewing alex textures. +- Fixed sorting textures in skin library. diff --git a/resources/misc/changelogs/zh_CN/4.1.4.md b/resources/misc/changelogs/zh_CN/4.1.4.md index e30be515..e9ba36a9 100644 --- a/resources/misc/changelogs/zh_CN/4.1.4.md +++ b/resources/misc/changelogs/zh_CN/4.1.4.md @@ -2,3 +2,4 @@ - 修复移动端下皮肤库下拉菜单失效的问题 - 修复 Alex 材质的预览 +- 修复皮肤库中的排序问题