zhangyuheng/blessing-skin-server
1
0
Fork 0
forked from mirror/blessing-skin-server
Code Pull Requests Activity

Fix #104

Browse Source
This commit is contained in:
printempw 2017-11-07 20:45:29 +08:00
parent 64d8b44a13
commit 6c7b494f16
2 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -216,25 +216,16 @@ class SkinlibController extends Controller
}
if (option('return_score')) {
// remove the public texture from all users' closet
if ($result->public == 1) {
$users->get($result->uploader)->setScore(
$result->size * option('score_per_storage'), 'plus'
);
foreach (Closet::all() as $closet) {
if ($closet->has($result->tid)) {
$closet->remove($result->tid);
$users->get($closet->uid)->setScore(
option('score_per_closet_item'), 'plus'
);
}
if ($u = $users->get($result->uploader)) {
if ($result->public == 1) {
$u->setScore(
$result->size * option('score_per_storage'), 'plus'
);
} else {
$u->setScore(
$result->size * option('private_score_per_storage'), 'plus'
);
}
} else {
$users->get($result->uploader)->setScore(
$result->size * option('private_score_per_storage'), 'plus'
);
}
}
@ -264,16 +255,7 @@ class SkinlibController extends Controller
$player->setTexture(["tid_$type" => 0]);
}
foreach (Closet::all() as $closet) {
if ($closet->uid != $uid && $closet->has($t->tid)) {
$closet->remove($t->tid);
if (option('return_score')) {
$users->get($closet->uid)->setScore(option('score_per_closet_item'), 'plus');
}
}
}
$users->get($t->uploader)->setScore($score_diff, 'plus');
@$users->get($t->uploader)->setScore($score_diff, 'plus');
if ($t->setPrivacy(!$t->public)) {
return json([

26
app/Models/Closet.php
View File

@ -55,10 +55,28 @@ class Closet
));
// traverse items in the closet
$this->textures->filter(function ($texture) {
return is_null(Texture::find($texture['tid']));
})->each(function ($tid) {
$this->remove($tid);
$this->textures->filter(function ($texture) use ($uid) {
$t = Texture::find($texture['tid']);
// if the texture was deleted
if (is_null($t)) {
return true;
}
if ($t->public == 0 && $t->uploader != $uid) {
return true;
}
return false;
})->each(function ($texture) use ($uid) {
// return scores if the texture was deleted or set as private
if (option('return_score')) {
app('users')->get($uid)->setScore(
option('score_per_closet_item'), 'plus'
);
}
$this->remove($texture['tid']);
});
}