From 6b7fc63e76f5930e499c71e98a9821e28aaf43dd Mon Sep 17 00:00:00 2001
From: Chris Kankiewicz <Chris@ChrisKankiewicz.com>
Date: Mon, 6 Apr 2020 12:18:07 -0700
Subject: [PATCH] Simplified file hashing error message code a bit

---
 app/resources/js/components/file-info-modal.vue | 2 +-
 app/src/Controllers/FileInfoController.php      | 8 --------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/app/resources/js/components/file-info-modal.vue b/app/resources/js/components/file-info-modal.vue
index 3caedf4..ed8250c 100644
--- a/app/resources/js/components/file-info-modal.vue
+++ b/app/resources/js/components/file-info-modal.vue
@@ -75,7 +75,7 @@
                 await axios.get('?info=' + filePath).then(function (response) {
                     this.hashes = response.data.hashes;
                 }.bind(this)).catch(function (error) {
-                    this.error = error.response.data.message;
+                    this.error = error.response.request.statusText;
                 }.bind(this));
 
                 this.loading = false;
diff --git a/app/src/Controllers/FileInfoController.php b/app/src/Controllers/FileInfoController.php
index 652f7d7..f4d4fe1 100644
--- a/app/src/Controllers/FileInfoController.php
+++ b/app/src/Controllers/FileInfoController.php
@@ -48,18 +48,10 @@ class FileInfoController
         );
 
         if (! $file->isFile()) {
-            $response->getBody()->write(json_encode([
-                'message' => $this->translator->trans('error.file_not_found'),
-            ]));
-
             return $response->withStatus(404, $this->translator->trans('error.file_not_found'));
         }
 
         if ($file->getSize() >= $this->container->get('max_hash_size')) {
-            $response->getBody()->write(json_encode([
-                'message' => $this->translator->trans('error.file_size_exceeded'),
-            ]));
-
             return $response->withStatus(500, $this->translator->trans('error.file_size_exceeded'));
         }