From 634f0b726a01d90e72c0832ad60926e0ed512cde Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Thu, 4 Apr 2019 11:16:04 +0800
Subject: [PATCH] Inline one-time used helper function

---
 app/Http/Controllers/SkinlibController.php |  8 +++++++-
 app/helpers.php                            | 14 --------------
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/app/Http/Controllers/SkinlibController.php b/app/Http/Controllers/SkinlibController.php
index 40368c95..33a35f78 100644
--- a/app/Http/Controllers/SkinlibController.php
+++ b/app/Http/Controllers/SkinlibController.php
@@ -199,10 +199,16 @@ class SkinlibController extends Controller
             return $response;
         }
 
+        $file = $request->file('file');
+        $responses = event(new \App\Events\HashingFile($file));
+        if (isset($responses[0]) && is_string($responses[0])) {
+            return $responses[0];  // @codeCoverageIgnore
+        }
+
         $t = new Texture();
         $t->name = $request->input('name');
         $t->type = $request->input('type');
-        $t->hash = bs_hash_file($request->file('file'));
+        $t->hash = hash_file('sha256', $file);
         $t->size = ceil($request->file('file')->getSize() / 1024);
         $t->public = $request->input('public') == 'true';
         $t->uploader = $user->uid;
diff --git a/app/helpers.php b/app/helpers.php
index 60959d7a..95878c09 100644
--- a/app/helpers.php
+++ b/app/helpers.php
@@ -85,20 +85,6 @@ if (! function_exists('json')) {
     }
 }
 
-if (! function_exists('bs_hash_file')) {
-    function bs_hash_file(Illuminate\Http\UploadedFile $file)
-    {
-        // Try to get hash from event listener
-        $responses = event(new App\Events\HashingFile($file));
-        if (isset($responses[0]) && is_string($responses[0])) {
-            return $responses[0];
-        }
-
-        // Default to sha256 hash
-        return hash_file('sha256', $file);
-    }
-}
-
 if (! function_exists('bs_footer_extra')) {
     function bs_footer_extra()
     {