This commit is contained in:
myrmidex 2025-07-06 11:30:38 +02:00
parent 8de4368e50
commit 188a64094a
7 changed files with 90 additions and 40 deletions

View file

@ -14,9 +14,7 @@ class PublishToLemmyCommand extends Command
public function handle(): int public function handle(): int
{ {
$article = Article::all() $article = Article::whereDoesntHave('articlePublication')->firstOrFail();
->filter(fn (Article $article) => $article->articlePublication === null)
->firstOrFail();
$this->info('Queuing article for publishing: ' . $article->url); $this->info('Queuing article for publishing: ' . $article->url);

View file

@ -3,7 +3,9 @@
namespace App\Http\Controllers; namespace App\Http\Controllers;
use App\Models\Feed; 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\Contracts\View\View;
use Illuminate\Http\RedirectResponse; use Illuminate\Http\RedirectResponse;
@ -14,7 +16,7 @@ public function index(): View
$feeds = Feed::orderBy('is_active', 'desc') $feeds = Feed::orderBy('is_active', 'desc')
->orderBy('name') ->orderBy('name')
->get(); ->get();
return view('pages.feeds.index', compact('feeds')); return view('pages.feeds.index', compact('feeds'));
} }
@ -23,31 +25,18 @@ public function create(): View
return view('pages.feeds.create'); return view('pages.feeds.create');
} }
public function store(Request $request): RedirectResponse public function store(StoreFeedRequest $request): RedirectResponse
{ {
$validated = $request->validate([ $validated = $request->validated();
'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['is_active'] = $validated['is_active'] ?? true; $validated['is_active'] = $validated['is_active'] ?? true;
Feed::create($validated); Feed::create($validated);
// Check if there's a redirect_to parameter for onboarding flow return OnboardingRedirectService::handleRedirect(
$redirectTo = $request->input('redirect_to'); $request,
if ($redirectTo) { 'feeds.index',
return redirect($redirectTo) 'Feed created successfully!'
->with('success', 'Feed created successfully!'); );
}
return redirect()->route('feeds.index')
->with('success', 'Feed created successfully!');
} }
public function show(Feed $feed): View public function show(Feed $feed): View
@ -60,18 +49,9 @@ public function edit(Feed $feed): View
return view('pages.feeds.edit', compact('feed')); 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([ $validated = $request->validated();
'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['is_active'] = $validated['is_active'] ?? $feed->is_active; $validated['is_active'] = $validated['is_active'] ?? $feed->is_active;
$feed->update($validated); $feed->update($validated);
@ -87,4 +67,4 @@ public function destroy(Feed $feed): RedirectResponse
return redirect()->route('feeds.index') return redirect()->route('feeds.index')
->with('success', 'Feed deleted successfully!'); ->with('success', 'Feed deleted successfully!');
} }
} }

View file

@ -10,7 +10,7 @@ class LogsController extends Controller
{ {
public function __invoke(Request $request): View 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')); return view('pages.logs.index', compact('logs'));
} }

View file

@ -74,9 +74,11 @@ public function update(Request $request, PlatformChannel $channel): RedirectResp
$validated = $request->validate([ $validated = $request->validate([
'platform_instance_id' => 'required|exists:platform_instances,id', 'platform_instance_id' => 'required|exists:platform_instances,id',
'name' => 'required|string|max:255', 'name' => 'required|string|max:255',
'display_name' => 'required|string|max:255', 'display_name' => 'nullable|string|max:255',
'channel_id' => 'required|string|max:255', 'channel_id' => 'nullable|string|max:255',
'description' => 'nullable|string', 'description' => 'nullable|string',
'language_id' => 'required|exists:languages,id',
'is_active' => 'boolean',
]); ]);
$channel->update($validated); $channel->update($validated);

View file

@ -0,0 +1,25 @@
<?php
namespace App\Http\Requests;
use Illuminate\Foundation\Http\FormRequest;
class StoreFeedRequest extends FormRequest
{
public function authorize(): bool
{
return true;
}
public function rules(): array
{
return [
'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'
];
}
}

View file

@ -0,0 +1,25 @@
<?php
namespace App\Http\Requests;
use Illuminate\Foundation\Http\FormRequest;
class UpdateFeedRequest extends FormRequest
{
public function authorize(): bool
{
return true;
}
public function rules(): array
{
return [
'name' => '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'
];
}
}

View file

@ -0,0 +1,20 @@
<?php
namespace App\Services;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
class OnboardingRedirectService
{
public static function handleRedirect(Request $request, string $defaultRoute, string $successMessage): RedirectResponse
{
$redirectTo = $request->input('redirect_to');
if ($redirectTo) {
return redirect($redirectTo)->with('success', $successMessage);
}
return redirect()->route($defaultRoute)->with('success', $successMessage);
}
}