Leisuretimedock/blessing-skin-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix searching textures in skin library

Browse Source
This commit is contained in:
Pig Fang 2020-04-27 18:46:22 +08:00
parent 5ea1187f2a
commit 55990f24be
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/Http/Controllers/SkinlibController.php
View File

@ -59,9 +59,12 @@ class SkinlibController extends Controller
}) })
->when($user, function (Builder $query, User $user) { ->when($user, function (Builder $query, User $user) {
if (!$user->isAdmin()) { if (!$user->isAdmin()) {
return $query // use closure-style `where` clause to lift up SQL priority
->where('public', true) return $query->where(function (Builder $query) use ($user) {
->orWhere('uploader', $user->uid); $query
->where('public', true)
->orWhere('uploader', $user->uid);
});
} }
}, function (Builder $query) { }, function (Builder $query) {
// show public textures only to anonymous visitors // show public textures only to anonymous visitors

5
tests/HttpTest/ControllersTest/SkinlibControllerTest.php
View File

@ -55,6 +55,11 @@ class SkinlibControllerTest extends TestCase
['tid' => $steve->tid, 'nickname' => $steve->owner->nickname], ['tid' => $steve->tid, 'nickname' => $steve->owner->nickname],
], ],
]); ]);
$user = factory(User::class)->create();
$list = $this->actingAs($user)
->getJson('/skinlib/list?keyword=a')
->decodeResponseJson('data');
$this->assertCount(1, $list);
// with uploader // with uploader
$this->getJson('/skinlib/list?uploader='.$steve->uploader) $this->getJson('/skinlib/list?uploader='.$steve->uploader)