From 2b0f8b20c14607307e2b3497bcfc5362175b67d0 Mon Sep 17 00:00:00 2001
From: gplane <g-plane@hotmail.com>
Date: Fri, 21 Apr 2017 18:44:11 +0800
Subject: [PATCH] Fix score calculation

---
 app/Http/Controllers/ClosetController.php  |  2 +-
 app/Http/Controllers/SkinlibController.php | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/ClosetController.php b/app/Http/Controllers/ClosetController.php
index 5fe5273d..5f07b80b 100644
--- a/app/Http/Controllers/ClosetController.php
+++ b/app/Http/Controllers/ClosetController.php
@@ -119,7 +119,7 @@ class ClosetController extends Controller
             $t->save();
 
             if (option('return_score'))
-                app('user.current')->setScore(option('score_per_closet_item'), 'minus');
+                app('user.current')->setScore(option('score_per_closet_item'), 'plus');
 
             return json(trans('user.closet.remove.success'), 0);
         } else {
diff --git a/app/Http/Controllers/SkinlibController.php b/app/Http/Controllers/SkinlibController.php
index 5553fb40..7e7a4bba 100644
--- a/app/Http/Controllers/SkinlibController.php
+++ b/app/Http/Controllers/SkinlibController.php
@@ -197,7 +197,10 @@ class SkinlibController extends Controller
             Storage::delete($result['hash']);
 
         if (option('return_score')) {
-            $this->user->setScore($result->size * Option::get('score_per_storage'), 'plus');
+            if ($result->public == 1)
+                $this->user->setScore($result->size * Option::get('score_per_storage'), 'plus');
+            else
+                $this->user->setScore($result->size * Option::get('private_score_per_storage'), 'plus');
         }
 
         if ($result->delete())
@@ -223,9 +226,17 @@ class SkinlibController extends Controller
         foreach (Closet::all() as $closet) {
             if ($closet->uid != $uid && $closet->has($t->tid)) {
                 $closet->remove($t->tid);
+                if (option('return_score')) {
+                    User::find($closet->uid)->setScore(option('score_per_closet_item'), 'plus');
+                }
             }
         }
 
+        app('user.current')->setScore(
+            $t->size * (option('private_score_per_storage') - option('score_per_storage')) * ($t->public == 1 ? -1 : 1),
+            'plus'
+        );
+
         if ($t->setPrivacy(!$t->public)) {
             return json([
                 'errno'  => 0,