Skip to content

A self-hosted media server and file management system

feat: allow authenticated users to generate storyboard

aminnausin12fc8c51fe15
diff --git a/app/Http/Controllers/Api/V1/Metadata/StoryboardController.php b/app/Http/Controllers/Api/V1/Metadata/StoryboardController.php
index a04e0813..9e0aa0c0 100644
--- a/app/Http/Controllers/Api/V1/Metadata/StoryboardController.php
+++ b/app/Http/Controllers/Api/V1/Metadata/StoryboardController.php
@@ -10,6 +10,8 @@ use App\Models\Storyboard;
use App\Models\SubTask;
use App\Services\FileJobService;
use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Gate;
+use Illuminate\Support\Facades\RateLimiter;
use Illuminate\Support\Facades\Storage;
class StoryboardController extends Controller {
@@ -23,7 +25,27 @@ class StoryboardController extends Controller {
}
public function regenerate(Metadata $metadata) {
- $this->authorize('admin');
+ $isAdmin = Gate::allows('admin');
+
+ if (! $isAdmin) {
+ $perMinuteKey = 'storyboard-regenerate:minute:' . Auth::id();
+ $perHourKey = 'storyboard-regenerate:hour:' . Auth::id();
+
+ if (RateLimiter::tooManyAttempts($perMinuteKey, 1)) {
+ return response()->json([
+ 'message' => 'Too many requests. Try again in ' . RateLimiter::availableIn($perMinuteKey) . ' seconds.',
+ ], 429);
+ }
+
+ if (RateLimiter::tooManyAttempts($perHourKey, 15)) {
+ return response()->json([
+ 'message' => 'Hourly limit reached. Try again in ' . ceil(RateLimiter::availableIn($perHourKey) / 60) . ' minutes.',
+ ], 429);
+ }
+
+ RateLimiter::hit($perMinuteKey, 60);
+ RateLimiter::hit($perHourKey, 3600);
+ }
$alreadyRunning = SubTask::where('reference_uuid', $metadata->uuid)
->where('reference_type', Storyboard::class)
diff --git a/resources/js/components/video/VideoInfoPanel.vue b/resources/js/components/video/VideoInfoPanel.vue
index d0d5bdf2..37228dd4 100755
--- a/resources/js/components/video/VideoInfoPanel.vue
+++ b/resources/js/components/video/VideoInfoPanel.vue
@@ -1,4 +1,6 @@
<script setup lang="ts">
+import type { AxiosError } from 'axios';
+
import { computed, onMounted, ref, useTemplateRef, watch, nextTick } from 'vue';
import { handleStorageURL, toTimeSpan, formatFileSize } from '@/service/util';
import { getMediaDateDescription } from '@/service/media/mediaFormatter';
@@ -40,7 +42,7 @@ const props = defineProps<{ getCurrentTime: () => number }>();
const { stateVideo, stateFolder, stateDirectory } = storeToRefs(useContentStore());
const { title, description: parsedDescription, views } = useMetaData(stateVideo);
-const { userData, isAuthenticated, isAdmin } = useAuth();
+const { userData, isAuthenticated } = useAuth();
const descriptionRef = useTemplateRef('description');
const mobilePopover = useTemplateRef('mobile-popover');
@@ -87,7 +89,7 @@ const popoverItems = computed(() => {
{
icon: ProIconsPhoto,
text: 'Reset Storyboard',
- hidden: !isAdmin.value || stateVideo.value.metadata?.media_type === 1,
+ hidden: !isAuthenticated.value || stateVideo.value.metadata?.media_type === 1,
action: handleResetStoryboard,
},
];
@@ -136,6 +138,10 @@ const handleResetSubtitles = () => {
loadingDescription: `Clearing subtitle cache`,
success: 'Subtitles Reset!',
error: 'Failed to reset subtitles',
+ errorDescription: (err) => {
+ const axiosErr = err as AxiosError<{ message?: string }>;
+ return axiosErr.response?.data?.message ?? axiosErr.message;
+ },
});
};
diff --git a/resources/js/service/media/storyboard.ts b/resources/js/service/media/storyboard.ts
index f8182b2d..d0723a68 100644
--- a/resources/js/service/media/storyboard.ts
+++ b/resources/js/service/media/storyboard.ts
@@ -1,15 +1,16 @@
+import type { AxiosError, AxiosResponse } from 'axios';
import type { StoryboardResource } from '@/contracts/media';
-import type { AxiosResponse } from 'axios';
import { subscribeToTask } from '../wsService';
import { useContentStore } from '@/stores/ContentStore';
import { useAppStore } from '@/stores/AppStore';
import { toast } from '@aminnausin/cedar-ui';
-import { API } from '../api';
+import { API } from '@/service/api';
export const regenerateStoryboard = (metadataId: number): Promise<AxiosResponse<{ task_id: number; message?: string }>> => {
- return API.post(`/metadata/${metadataId}/storyboard`, { headers: { 'X-Skip-Toast': 'true' } });
+ return API.post(`/metadata/${metadataId}/storyboard`, {}, { headers: { 'X-Skip-Toast': 'true' } });
};
+
export const getStoryboard = (metadataId: number): Promise<AxiosResponse<StoryboardResource>> => {
return API.get(`/metadata/${metadataId}/storyboard`);
};
@@ -37,6 +38,10 @@ export const runRegenerateStoryboard = async (videoId: number, metadataId: numbe
success: 'Storyboard Reset!',
successDescription: 'Storyboard reset and regeneration job queued',
error: 'Failed to reset storyboard',
+ errorDescription: (err) => {
+ const axiosErr = err as AxiosError<{ message?: string }>;
+ return axiosErr.response?.data?.message ?? axiosErr.message;
+ },
});
contentStore.updateVideoData({ id: videoId, storyboard: undefined });
diff --git a/resources/js/service/media/subtitles.ts b/resources/js/service/media/subtitles.ts
index 0b12fbe3..fd2ccb60 100644
--- a/resources/js/service/media/subtitles.ts
+++ b/resources/js/service/media/subtitles.ts
@@ -1,5 +1,5 @@
import { API } from '../api';
export const resetSubtitles = (metadataId: number) => {
- return API.delete(`/metadata/${metadataId}/subtitles`);
+ return API.delete(`/metadata/${metadataId}/subtitles`, { headers: { 'X-Skip-Toast': 'true' } });
};