diff --git a/app/Console/Commands/PublishToLemmyCommand.php b/app/Console/Commands/PublishToLemmyCommand.php index 2e32327..deed39b 100644 --- a/app/Console/Commands/PublishToLemmyCommand.php +++ b/app/Console/Commands/PublishToLemmyCommand.php @@ -14,9 +14,7 @@ class PublishToLemmyCommand extends Command public function handle(): int { - $article = Article::all() - ->filter(fn (Article $article) => $article->articlePublication === null) - ->firstOrFail(); + $article = Article::whereDoesntHave('articlePublication')->firstOrFail(); $this->info('Queuing article for publishing: ' . $article->url); diff --git a/app/Http/Controllers/FeedsController.php b/app/Http/Controllers/FeedsController.php index c23040d..19b9074 100644 --- a/app/Http/Controllers/FeedsController.php +++ b/app/Http/Controllers/FeedsController.php @@ -3,7 +3,9 @@ namespace App\Http\Controllers; use App\Models\Feed; -use Illuminate\Http\Request; +use App\Http\Requests\StoreFeedRequest; +use App\Http\Requests\UpdateFeedRequest; +use App\Services\OnboardingRedirectService; use Illuminate\Contracts\View\View; use Illuminate\Http\RedirectResponse; @@ -14,7 +16,7 @@ public function index(): View $feeds = Feed::orderBy('is_active', 'desc') ->orderBy('name') ->get(); - + return view('pages.feeds.index', compact('feeds')); } @@ -23,31 +25,18 @@ public function create(): View return view('pages.feeds.create'); } - public function store(Request $request): RedirectResponse + public function store(StoreFeedRequest $request): RedirectResponse { - $validated = $request->validate([ - 'name' => 'required|string|max:255', - 'url' => 'required|url|unique:feeds,url', - 'type' => 'required|in:website,rss', - 'language_id' => 'required|exists:languages,id', - 'description' => 'nullable|string', - 'is_active' => 'boolean' - ]); - - // Default is_active to true if not provided + $validated = $request->validated(); $validated['is_active'] = $validated['is_active'] ?? true; Feed::create($validated); - // Check if there's a redirect_to parameter for onboarding flow - $redirectTo = $request->input('redirect_to'); - if ($redirectTo) { - return redirect($redirectTo) - ->with('success', 'Feed created successfully!'); - } - - return redirect()->route('feeds.index') - ->with('success', 'Feed created successfully!'); + return OnboardingRedirectService::handleRedirect( + $request, + 'feeds.index', + 'Feed created successfully!' + ); } public function show(Feed $feed): View @@ -60,18 +49,9 @@ public function edit(Feed $feed): View return view('pages.feeds.edit', compact('feed')); } - public function update(Request $request, Feed $feed): RedirectResponse + public function update(UpdateFeedRequest $request, Feed $feed): RedirectResponse { - $validated = $request->validate([ - 'name' => 'required|string|max:255', - 'url' => 'required|url|unique:feeds,url,' . $feed->id, - 'type' => 'required|in:website,rss', - 'language_id' => 'required|exists:languages,id', - 'description' => 'nullable|string', - 'is_active' => 'boolean' - ]); - - // Default is_active to current value if not provided + $validated = $request->validated(); $validated['is_active'] = $validated['is_active'] ?? $feed->is_active; $feed->update($validated); @@ -87,4 +67,4 @@ public function destroy(Feed $feed): RedirectResponse return redirect()->route('feeds.index') ->with('success', 'Feed deleted successfully!'); } -} \ No newline at end of file +} diff --git a/app/Http/Controllers/LogsController.php b/app/Http/Controllers/LogsController.php index 0522f00..c38fb91 100644 --- a/app/Http/Controllers/LogsController.php +++ b/app/Http/Controllers/LogsController.php @@ -10,7 +10,7 @@ class LogsController extends Controller { public function __invoke(Request $request): View { - $logs = Log::all()->sortByDesc('created_at'); + $logs = Log::orderBy('created_at', 'desc')->paginate(50); return view('pages.logs.index', compact('logs')); } diff --git a/app/Http/Controllers/PlatformChannelsController.php b/app/Http/Controllers/PlatformChannelsController.php index 7658421..c3761cc 100644 --- a/app/Http/Controllers/PlatformChannelsController.php +++ b/app/Http/Controllers/PlatformChannelsController.php @@ -74,9 +74,11 @@ public function update(Request $request, PlatformChannel $channel): RedirectResp $validated = $request->validate([ 'platform_instance_id' => 'required|exists:platform_instances,id', 'name' => 'required|string|max:255', - 'display_name' => 'required|string|max:255', - 'channel_id' => 'required|string|max:255', + 'display_name' => 'nullable|string|max:255', + 'channel_id' => 'nullable|string|max:255', 'description' => 'nullable|string', + 'language_id' => 'required|exists:languages,id', + 'is_active' => 'boolean', ]); $channel->update($validated); diff --git a/app/Http/Requests/StoreFeedRequest.php b/app/Http/Requests/StoreFeedRequest.php new file mode 100644 index 0000000..d7a3983 --- /dev/null +++ b/app/Http/Requests/StoreFeedRequest.php @@ -0,0 +1,25 @@ + 'required|string|max:255', + 'url' => 'required|url|unique:feeds,url', + 'type' => 'required|in:website,rss', + 'language_id' => 'required|exists:languages,id', + 'description' => 'nullable|string', + 'is_active' => 'boolean' + ]; + } +} \ No newline at end of file diff --git a/app/Http/Requests/UpdateFeedRequest.php b/app/Http/Requests/UpdateFeedRequest.php new file mode 100644 index 0000000..8cb8571 --- /dev/null +++ b/app/Http/Requests/UpdateFeedRequest.php @@ -0,0 +1,25 @@ + 'required|string|max:255', + 'url' => 'required|url|unique:feeds,url,' . $this->route('feed')?->id, + 'type' => 'required|in:website,rss', + 'language_id' => 'required|exists:languages,id', + 'description' => 'nullable|string', + 'is_active' => 'boolean' + ]; + } +} \ No newline at end of file diff --git a/app/Services/OnboardingRedirectService.php b/app/Services/OnboardingRedirectService.php new file mode 100644 index 0000000..6382fbc --- /dev/null +++ b/app/Services/OnboardingRedirectService.php @@ -0,0 +1,20 @@ +input('redirect_to'); + + if ($redirectTo) { + return redirect($redirectTo)->with('success', $successMessage); + } + + return redirect()->route($defaultRoute)->with('success', $successMessage); + } +} \ No newline at end of file