Merge pull request #83 from Havenstd06/analysis-d0r0bw

Apply fixes from StyleCI
Havenstd06 · Oct 2, 2020 · 0ae6a2c · 0ae6a2c
2 parents fdca003 + ff75ee2
commit 0ae6a2c
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 21 deletions.
diff --git a/app/Http/Controllers/API/ImageController.php b/app/Http/Controllers/API/ImageController.php
@@ -30,7 +30,6 @@ public function discover()
             ->orderBy('created_at', 'DESC')
             ->jsonPaginate(100);
 
-
         return response()->json([
             'images' => $discover,
             'success' => true,
@@ -187,11 +186,10 @@ public function show(Request $request, $pageName)
             ->with('user')
             ->firstOrFail();
 
-        if ($image->is_public == ImageStateType::Discover)
-        {
+        if ($image->is_public == ImageStateType::Discover) {
             return response()->json([
                 'data' => [
-                    $image
+                    $image,
                 ],
                 'success' => true,
                 'status'  => 200,
@@ -222,7 +220,7 @@ public function show(Request $request, $pageName)
 
         return response()->json([
             'data' => [
-                $image
+                $image,
             ],
             'success' => true,
             'status'  => 200,

diff --git a/app/Http/Controllers/API/UserController.php b/app/Http/Controllers/API/UserController.php
@@ -11,7 +11,7 @@
 class UserController extends Controller
 {
     /**
-     * Return user private image
+     * Return user private image.
      *
      * @param Request $request
      * @param $username
@@ -49,9 +49,10 @@ public function all(Request $request, $username)
 
         return response()->json([
             'success' => false,
-            'error'   => "Please enter the API key for user ".$user->username,
+            'error'   => 'Please enter the API key for user '.$user->username,
         ], 401);
     }
+
     /**
      * Return user discover image.
      *
@@ -73,12 +74,12 @@ public function discover(Request $request, $username)
         return response()->json([
             'images' => $discover_images,
             'success' => true,
-            'status'  => 200
+            'status'  => 200,
         ], 200, [], JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT);
     }
 
     /**
-     * Return user public image
+     * Return user public image.
      *
      * @param Request $request
      * @param $username
@@ -117,12 +118,12 @@ public function public(Request $request, $username)
 
         return response()->json([
             'success' => false,
-            'error'   => "Please enter the API key for user ".$user->username,
+            'error'   => 'Please enter the API key for user '.$user->username,
         ], 401);
     }
 
     /**
-     * Return user private image
+     * Return user private image.
      *
      * @param Request $request
      * @param $username
@@ -161,9 +162,10 @@ public function private(Request $request, $username)
 
         return response()->json([
             'success' => false,
-            'error'   => "Please enter the API key for user ".$user->username,
+            'error'   => 'Please enter the API key for user '.$user->username,
         ], 401);
     }
+
     /**
      * Return site stats.
      *
@@ -229,13 +231,13 @@ public function user(Request $request, $username)
             ];
 
             return response()->json([
-                "stats" => $user_private_stats,
-                "info"  => $user_private_info,
+                'stats' => $user_private_stats,
+                'info'  => $user_private_info,
             ], 200, [], JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT);
         } else { // Public
             return response()->json([
-                "stats" => $user_stats,
-                "info"  => $user_info,
+                'stats' => $user_stats,
+                'info'  => $user_info,
             ], 200, [], JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT);
         }
     }

diff --git a/app/Image.php b/app/Image.php
@@ -2,7 +2,6 @@
 
 namespace App;
 
-use App\Enums\ImageStateType;
 use Conner\Likeable\Likeable;
 use Illuminate\Database\Eloquent\Model;
 
@@ -17,7 +16,7 @@ class Image extends Model
     protected $appends = [
         'link',
         'delete',
-        'page'
+        'page',
     ];
 
     public function user()

diff --git a/app/User.php b/app/User.php
@@ -47,7 +47,7 @@ public function getRouteKeyName()
         'always_public',
         'always_discover',
         'created_at',
-        'updated_at'
+        'updated_at',
     ];
 
     /**

diff --git a/routes/api.php b/routes/api.php
@@ -13,7 +13,6 @@
 
 // Stats
 use App\Http\Controllers\API\ImageController as APIImageController;
-use App\Http\Controllers\API\ImageV2Controller as APIImageV2Controller;
 use App\Http\Controllers\API\StatsController as APIStatsController;
 use App\Http\Controllers\API\UserController as APIUserController;
 
@@ -30,7 +29,6 @@
     Route::get('/{username}/images/private', [APIUserController::class, 'private']); // Return private user image
 });
 
-
 // Image OLD
 Route::prefix('/images')->group(function () {
     Route::get('/discover', [APIImageController::class, 'discover']); // Show public public images