BloomFeed Upgrade v0.21
This commit is contained in:
@@ -2,6 +2,7 @@
|
||||
|
||||
namespace App\Http\Controllers;
|
||||
|
||||
use App\Models\Setting;
|
||||
use App\Models\User;
|
||||
use Illuminate\Http\RedirectResponse;
|
||||
use Illuminate\Http\Request;
|
||||
@@ -11,11 +12,15 @@ use Illuminate\View\View;
|
||||
|
||||
class AuthController extends Controller
|
||||
{
|
||||
private function registrationsAllowed(): bool
|
||||
{
|
||||
return ! User::query()->exists() || Setting::registrationsOpen();
|
||||
}
|
||||
|
||||
public function showRegister(): View|RedirectResponse
|
||||
{
|
||||
if (User::query()->exists()) {
|
||||
return redirect()->route('login')
|
||||
->with('status', 'Les inscriptions sont fermées sur cette instance. Connectez-vous.');
|
||||
if (! $this->registrationsAllowed()) {
|
||||
return redirect()->route('login')->with('status', __('app.registrations_closed'));
|
||||
}
|
||||
|
||||
return view('auth.register');
|
||||
@@ -23,9 +28,8 @@ class AuthController extends Controller
|
||||
|
||||
public function register(Request $request): RedirectResponse
|
||||
{
|
||||
if (User::query()->exists()) {
|
||||
return redirect()->route('login')
|
||||
->with('status', 'Les inscriptions sont fermées sur cette instance. Connectez-vous.');
|
||||
if (! $this->registrationsAllowed()) {
|
||||
return redirect()->route('login')->with('status', __('app.registrations_closed'));
|
||||
}
|
||||
|
||||
$validated = $request->validate([
|
||||
@@ -38,6 +42,8 @@ class AuthController extends Controller
|
||||
'name' => $validated['name'],
|
||||
'email' => $validated['email'],
|
||||
'password' => Hash::make($validated['password']),
|
||||
'is_owner' => ! User::query()->exists(),
|
||||
'locale' => session('locale'),
|
||||
]);
|
||||
|
||||
Auth::login($user);
|
||||
@@ -60,7 +66,7 @@ class AuthController extends Controller
|
||||
|
||||
if (! Auth::attempt($credentials, $request->boolean('remember'))) {
|
||||
return back()->withErrors([
|
||||
'email' => 'Ces identifiants ne correspondent à aucun compte.',
|
||||
'email' => __('app.invalid_credentials'),
|
||||
])->onlyInput('email');
|
||||
}
|
||||
|
||||
|
||||
@@ -32,10 +32,10 @@ class FeedController extends Controller
|
||||
$result = $service->fetchFeed($feed);
|
||||
|
||||
if ($result['error'] !== null) {
|
||||
return back()->with('status', "Flux ajouté, mais la première récupération a échoué : {$result['error']}");
|
||||
return back()->with('status', __('app.feed_added_error', ['error' => $result['error']]));
|
||||
}
|
||||
|
||||
return back()->with('status', "Flux ajouté avec {$result['new']} article(s).");
|
||||
return back()->with('status', __('app.feed_added', ['count' => $result['new']]));
|
||||
}
|
||||
|
||||
public function destroy(Feed $feed): RedirectResponse
|
||||
@@ -44,7 +44,7 @@ class FeedController extends Controller
|
||||
|
||||
$feed->delete();
|
||||
|
||||
return back()->with('status', 'Flux supprimé.');
|
||||
return back()->with('status', __('app.feed_deleted'));
|
||||
}
|
||||
|
||||
public function refresh(Feed $feed, FeedFetcherService $service): RedirectResponse
|
||||
@@ -54,10 +54,10 @@ class FeedController extends Controller
|
||||
$result = $service->fetchFeed($feed);
|
||||
|
||||
if ($result['error'] !== null) {
|
||||
return back()->with('status', "Échec de la récupération : {$result['error']}");
|
||||
return back()->with('status', __('app.refresh_failed', ['error' => $result['error']]));
|
||||
}
|
||||
|
||||
return back()->with('status', "{$result['new']} nouvel(aux) article(s).");
|
||||
return back()->with('status', __('app.new_articles', ['count' => $result['new']]));
|
||||
}
|
||||
|
||||
public function refreshAll(Request $request, FeedFetcherService $service): RedirectResponse
|
||||
@@ -69,6 +69,6 @@ class FeedController extends Controller
|
||||
$totalNew += $service->fetchFeed($feed)['new'];
|
||||
}
|
||||
|
||||
return back()->with('status', "{$totalNew} nouvel(aux) article(s) sur {$feeds->count()} flux.");
|
||||
return back()->with('status', __('app.new_articles_across', ['count' => $totalNew, 'feeds' => $feeds->count()]));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,117 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Controllers;
|
||||
|
||||
use App\Models\Setting;
|
||||
use App\Models\User;
|
||||
use App\Services\FluxCatalogService;
|
||||
use Illuminate\Http\RedirectResponse;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Hash;
|
||||
use Illuminate\View\View;
|
||||
|
||||
class SettingsController extends Controller
|
||||
{
|
||||
private function ensureOwner(Request $request): void
|
||||
{
|
||||
abort_unless($request->user()->is_owner, 403);
|
||||
}
|
||||
|
||||
public function index(Request $request): View
|
||||
{
|
||||
$this->ensureOwner($request);
|
||||
|
||||
return view('settings', [
|
||||
'registrationsOpen' => Setting::registrationsOpen(),
|
||||
'users' => User::query()->orderBy('created_at')->get(),
|
||||
'catalogSources' => Setting::catalogSources(),
|
||||
]);
|
||||
}
|
||||
|
||||
public function addCatalogSource(Request $request, FluxCatalogService $catalog): RedirectResponse
|
||||
{
|
||||
$this->ensureOwner($request);
|
||||
|
||||
$validated = $request->validate([
|
||||
'source_url' => ['required', 'url', 'max:2048'],
|
||||
]);
|
||||
|
||||
$sources = Setting::catalogSources();
|
||||
|
||||
if (in_array($validated['source_url'], $sources, true)) {
|
||||
return redirect()->route('settings')->with('status', __('app.source_already_added'));
|
||||
}
|
||||
|
||||
$count = $catalog->validateSource($validated['source_url']);
|
||||
|
||||
if ($count === null) {
|
||||
return redirect()->route('settings')->withErrors(['source_url' => __('app.source_invalid')]);
|
||||
}
|
||||
|
||||
$sources[] = $validated['source_url'];
|
||||
Setting::setCatalogSources($sources);
|
||||
|
||||
return redirect()->route('settings')->with('status', __('app.source_added', ['count' => $count]));
|
||||
}
|
||||
|
||||
public function removeCatalogSource(Request $request): RedirectResponse
|
||||
{
|
||||
$this->ensureOwner($request);
|
||||
|
||||
$validated = $request->validate([
|
||||
'source_url' => ['required', 'string'],
|
||||
]);
|
||||
|
||||
Setting::setCatalogSources(array_filter(
|
||||
Setting::catalogSources(),
|
||||
fn (string $url) => $url !== $validated['source_url']
|
||||
));
|
||||
|
||||
return redirect()->route('settings')->with('status', __('app.source_removed'));
|
||||
}
|
||||
|
||||
public function toggleRegistrations(Request $request): RedirectResponse
|
||||
{
|
||||
$this->ensureOwner($request);
|
||||
|
||||
$open = ! Setting::registrationsOpen();
|
||||
Setting::set('registrations_open', $open ? '1' : '0');
|
||||
|
||||
return redirect()->route('settings')
|
||||
->with('status', $open ? __('app.registrations_now_open') : __('app.registrations_now_closed'));
|
||||
}
|
||||
|
||||
public function createUser(Request $request): RedirectResponse
|
||||
{
|
||||
$this->ensureOwner($request);
|
||||
|
||||
$validated = $request->validate([
|
||||
'name' => ['required', 'string', 'max:255'],
|
||||
'email' => ['required', 'string', 'email', 'max:255', 'unique:users,email'],
|
||||
'password' => ['required', 'string', 'min:8'],
|
||||
]);
|
||||
|
||||
User::create([
|
||||
'name' => $validated['name'],
|
||||
'email' => $validated['email'],
|
||||
'password' => Hash::make($validated['password']),
|
||||
]);
|
||||
|
||||
return redirect()->route('settings')->with('status', __('app.user_created'));
|
||||
}
|
||||
|
||||
public function updateLocale(Request $request): RedirectResponse
|
||||
{
|
||||
$validated = $request->validate([
|
||||
'locale' => ['required', 'in:fr,en,es,de'],
|
||||
]);
|
||||
|
||||
session(['locale' => $validated['locale']]);
|
||||
|
||||
if ($request->user()) {
|
||||
$request->user()->update(['locale' => $validated['locale']]);
|
||||
}
|
||||
|
||||
return back();
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user