Skip to content

A self-hosted media server and file management system

chore: Lower error levels and clean up http response structure

aminnausin91b115afd715
diff --git a/app/Http/Controllers/Api/V1/UserController.php b/app/Http/Controllers/Api/V1/UserController.php
index 4edbd30c..af28468b 100644
--- a/app/Http/Controllers/Api/V1/UserController.php
+++ b/app/Http/Controllers/Api/V1/UserController.php
@@ -67,10 +67,10 @@ class UserController extends Controller {
if ($response->getStatusCode() >= 200 && $response->getStatusCode() < 300) {
return json_decode($response->getBody(), true);
}
- Log::error('Plausible API error: ' . $response->getBody());
+ Log::warning('Plausible API error: ' . $response->getBody());
}
} catch (\Throwable $th) {
- Log::error('Plausible Internal Error: ' . $th->getMessage());
+ Log::warning('Plausible Internal Error: ' . $th->getMessage());
}
// Default to returning internal session count and only throw this error
diff --git a/app/Jobs/VerifyFolders.php b/app/Jobs/VerifyFolders.php
index 5129b55e..a7d38073 100644
--- a/app/Jobs/VerifyFolders.php
+++ b/app/Jobs/VerifyFolders.php
@@ -167,7 +167,7 @@ class VerifyFolders implements ShouldQueue {
}
} catch (\Throwable $th) {
// throw $th;
- Log::error('Unable to download thumbnail image from ' . $url . ' : ' . $th->getMessage());
+ Log::warning('Unable to download thumbnail image from ' . $url . ' : ' . $th->getMessage());
}
return false;
diff --git a/app/Traits/HttpResponses.php b/app/Traits/HttpResponses.php
index 0a434a13..80ace99e 100755
--- a/app/Traits/HttpResponses.php
+++ b/app/Traits/HttpResponses.php
@@ -5,8 +5,6 @@ namespace App\Traits;
trait HttpResponses {
protected function success($data, $message = null, $code = 200) {
return response()->json([
- 'success' => true,
- 'status' => 'success',
'message' => $message,
'data' => $data,
], $code);
@@ -14,8 +12,6 @@ trait HttpResponses {
protected function error($data, $message, $code) {
return response()->json([
- 'success' => false,
- 'status' => 'failure',
'message' => $message,
'data' => $data,
], $code);
diff --git a/resources/js/stores/ContentStore.js b/resources/js/stores/ContentStore.js
index caf51264..20789834 100755
--- a/resources/js/stores/ContentStore.js
+++ b/resources/js/stores/ContentStore.js
@@ -137,7 +137,7 @@ export const useContentStore = defineStore('Content', () => {
const { data, error } = await recordsAPI.getRecords(limit ? `?limit=${limit}` : '');
- if (error || !data?.success) {
+ if (error) {
const message = error?.message || data?.message || 'Unknown error occurred';
console.log(message);
throw new Error(message);
@@ -154,12 +154,6 @@ export const useContentStore = defineStore('Content', () => {
// statedir (list of folders) = dir => /api/categories/1
// statefolder (list of videos) = folder => /api/folders/8?videos=true
- if (!response?.success) {
- toast.add('Error', { type: 'danger', description: response?.message ?? 'Unable to load data.' });
- console.log(error ?? response?.message);
- return false;
- }
-
stateDirectory.value = response.data.dir;
stateFolder.value = response.data.folder;
// folders.value = data.data.dir.folders;
@@ -176,7 +170,8 @@ export const useContentStore = defineStore('Content', () => {
// InitPlaylist();
return true;
} catch (error) {
- console.log(error);
+ toast.add('Error', { type: 'danger', description: response?.message ?? 'Unable to load data.' });
+ console.log(error ?? response?.message);
return false;
}
}
@@ -216,7 +211,7 @@ export const useContentStore = defineStore('Content', () => {
async function updateViewCount(id) {
const { data, error } = await mediaAPI.viewVideo(id);
- if (error || !data?.success) {
+ if (error) {
const message = error?.message || data?.message || 'Unknown error occurred';
console.log(message);
throw new Error(message);
@@ -230,7 +225,7 @@ export const useContentStore = defineStore('Content', () => {
if (!userData.value) return;
const { data, error } = await recordsAPI.createRecord({ video_id: id });
- if (error || !data?.success) {
+ if (error) {
const message = error?.message || data?.message || 'Unknown error occurred';
console.log(message);
throw new Error(message);
@@ -242,7 +237,7 @@ export const useContentStore = defineStore('Content', () => {
async function deleteRecord(id) {
const recordID = parseInt(id);
const { data, error } = await recordsAPI.deleteRecord(`/${recordID}`);
- if (error || !data?.success) {
+ if (error) {
console.log(error ?? data?.message);
return false;
}