.forgejo/workflows/ci.yml

@@ -1,113 +0,0 @@
-name: CI
-
-on:
-  push:
-    branches: ['release/*']
-  pull_request:
-    branches: [main]
-
-jobs:
-  ci:
-    runs-on: docker
-    container:
-      image: catthehacker/ubuntu:act-latest
-    steps:
-      - uses: https://data.forgejo.org/actions/checkout@v4
-
-      - name: Set up PHP
-        uses: https://github.com/shivammathur/setup-php@v2
-        with:
-          php-version: '8.3'
-          extensions: pdo_sqlite, mbstring, xml, dom
-          coverage: pcov
-
-      - name: Cache Composer dependencies
-        uses: https://data.forgejo.org/actions/cache@v4
-        with:
-          path: ~/.composer/cache
-          key: composer-${{ hashFiles('composer.lock') }}
-          restore-keys: composer-
-
-      - name: Install dependencies
-        run: composer install --no-interaction --prefer-dist
-
-      - name: Prepare environment
-        run: cp .env.testing .env
-
-      - name: Lint
-        run: vendor/bin/pint --test
-
-      - name: Static analysis
-        run: vendor/bin/phpstan analyse
-
-      - name: Tests
-        run: php artisan test --coverage-clover coverage.xml --coverage-text
-
-      - name: Parse coverage
-        if: github.event_name == 'pull_request'
-        id: coverage
-        run: |
-          COVERAGE=$(php -r '
-            $xml = simplexml_load_file("coverage.xml");
-            if ($xml === false || !isset($xml->project->metrics)) {
-              echo "0";
-              exit;
-            }
-            $metrics = $xml->project->metrics;
-            $statements = (int) $metrics["statements"];
-            $covered = (int) $metrics["coveredstatements"];
-            echo $statements > 0 ? round(($covered / $statements) * 100, 2) : 0;
-          ')
-          echo "percentage=$COVERAGE" >> "$GITHUB_OUTPUT"
-
-      - name: Comment coverage on PR
-        if: github.event_name == 'pull_request'
-        env:
-          FORGEJO_TOKEN: ${{ secrets.FORGEJO_TOKEN }}
-          PR_NUMBER: ${{ github.event.pull_request.number }}
-          COVERAGE: ${{ steps.coverage.outputs.percentage }}
-          REPO: ${{ github.repository }}
-          SERVER_URL: ${{ github.server_url }}
-          COMMIT_SHA: ${{ github.sha }}
-        run: |
-          API_URL="${SERVER_URL}/api/v1/repos/${REPO}/issues/${PR_NUMBER}/comments"
-          MARKER="<!-- ffr-ci-coverage-report -->"
-
-          BODY="${MARKER}
-          ## Code Coverage Report
-
-          | Metric | Value |
-          |--------|-------|
-          | **Line Coverage** | ${COVERAGE}% |
-
-          _Updated by CI — commit ${COMMIT_SHA}_"
-
-          # Find existing coverage comment
-          EXISTING=$(curl -sf -H "Authorization: token ${FORGEJO_TOKEN}" \
-            "${API_URL}?limit=50" | \
-            php -r '
-              $comments = json_decode(file_get_contents("php://stdin"), true);
-              if (!is_array($comments)) exit;
-              foreach ($comments as $c) {
-                if (str_contains($c["body"], "<!-- ffr-ci-coverage-report -->")) {
-                  echo $c["id"];
-                  exit;
-                }
-              }
-            ' || true)
-
-          if [ -n "$EXISTING" ]; then
-            # Update existing comment
-            curl -sf -X PATCH \
-              -H "Authorization: token ${FORGEJO_TOKEN}" \
-              -H "Content-Type: application/json" \
-              -d "$(php -r 'echo json_encode(["body" => $argv[1]]);' "$BODY")" \
-              "${SERVER_URL}/api/v1/repos/${REPO}/issues/comments/${EXISTING}" > /dev/null
-          else
-            # Create new comment
-            curl -sf -X POST \
-              -H "Authorization: token ${FORGEJO_TOKEN}" \
-              -H "Content-Type: application/json" \
-              -d "$(php -r 'echo json_encode(["body" => $argv[1]]);' "$BODY")" \
-              "${API_URL}" > /dev/null
-          fi

app/Contracts/ArticleParserInterface.php

@@ -11,7 +11,6 @@ public function canParse(string $url): bool;
 
     /**
      * Extract article data from HTML
-     *
      * @return array<string, mixed>
      */
     public function extractData(string $html): array;

app/Contracts/HomepageParserInterface.php

@@ -11,7 +11,6 @@ public function canParse(string $url): bool;
 
     /**
      * Extract article URLs from homepage HTML
-     *
      * @return array<int, string>
      */
     public function extractArticleUrls(string $html): array;

app/Enums/ApprovalStatusEnum.php

@@ -1,10 +0,0 @@
-<?php
-
-namespace App\Enums;
-
-enum ApprovalStatusEnum: string
-{
-    case PENDING = 'pending';
-    case APPROVED = 'approved';
-    case REJECTED = 'rejected';
-}

app/Enums/NotificationSeverityEnum.php

@@ -1,10 +0,0 @@
-<?php
-
-namespace App\Enums;
-
-enum NotificationSeverityEnum: string
-{
-    case INFO = 'info';
-    case WARNING = 'warning';
-    case ERROR = 'error';
-}

app/Enums/NotificationTypeEnum.php

@@ -1,21 +0,0 @@
-<?php
-
-namespace App\Enums;
-
-enum NotificationTypeEnum: string
-{
-    case GENERAL = 'general';
-    case FEED_STALE = 'feed_stale';
-    case PUBLISH_FAILED = 'publish_failed';
-    case CREDENTIAL_EXPIRED = 'credential_expired';
-
-    public function label(): string
-    {
-        return match ($this) {
-            self::GENERAL => 'General',
-            self::FEED_STALE => 'Feed Stale',
-            self::PUBLISH_FAILED => 'Publish Failed',
-            self::CREDENTIAL_EXPIRED => 'Credential Expired',
-        };
-    }
-}

app/Enums/PlatformEnum.php

@@ -5,18 +5,4 @@
 enum PlatformEnum: string
 {
     case LEMMY = 'lemmy';
-
-    public function channelLabel(): string
-    {
-        return match ($this) {
-            self::LEMMY => 'Community',
-        };
-    }
-
-    public function channelLabelPlural(): string
-    {
-        return match ($this) {
-            self::LEMMY => 'Communities',
-        };
-    }
 }

app/Enums/PublishStatusEnum.php

@@ -1,11 +0,0 @@
-<?php
-
-namespace App\Enums;
-
-enum PublishStatusEnum: string
-{
-    case UNPUBLISHED = 'unpublished';
-    case PUBLISHING = 'publishing';
-    case PUBLISHED = 'published';
-    case ERROR = 'error';
-}

app/Events/ActionPerformed.php

@@ -1,18 +0,0 @@
-<?php
-
-namespace App\Events;
-
-use App\Enums\LogLevelEnum;
-use Illuminate\Foundation\Events\Dispatchable;
-
-class ActionPerformed
-{
-    use Dispatchable;
-
-    public function __construct(
-        public string $message,
-        public LogLevelEnum $level = LogLevelEnum::INFO,
-        /** @var array<string, mixed> */
-        public array $context = [],
-    ) {}
-}

app/Events/ArticleApproved.php

@@ -2,13 +2,16 @@
 
 namespace App\Events;
 
-use App\Models\RouteArticle;
+use App\Models\Article;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 
-class RouteArticleApproved
+class ArticleApproved
 {
     use Dispatchable, SerializesModels;
 
-    public function __construct(public RouteArticle $routeArticle) {}
+    public function __construct(public Article $article)
+    {
+        //
+    }
 }

app/Events/ExceptionLogged.php

@@ -12,5 +12,6 @@ class ExceptionLogged
 
     public function __construct(
         public Log $log
-    ) {}
+    ) {
+    }
 }

app/Events/ExceptionOccurred.php

@@ -17,5 +17,6 @@ public function __construct(
         public string $message,
         /** @var array<string, mixed> */
         public array $context = []
-    ) {}
+    ) {
+    }
 }

app/Events/NewArticleFetched.php

@@ -11,5 +11,7 @@ class NewArticleFetched
 {
     use Dispatchable, InteractsWithSockets, SerializesModels;
 
-    public function __construct(public Article $article) {}
+    public function __construct(public Article $article)
+    {
+    }
 }

app/Exceptions/ChannelException.php

@@ -4,4 +4,6 @@
 
 use Exception;
 
-class ChannelException extends Exception {}
+class ChannelException extends Exception
+{
+}

app/Exceptions/PublishException.php

@@ -11,7 +11,7 @@ class PublishException extends Exception
 {
     public function __construct(
         private readonly Article $article,
-        private readonly ?PlatformEnum $platform,
+        private readonly PlatformEnum|null $platform,
         ?Throwable $previous = null
     ) {
         $message = "Failed to publish article #$article->id";

app/Exceptions/RoutingException.php

@@ -4,4 +4,6 @@
 
 use Exception;
 
-class RoutingException extends Exception {}
+class RoutingException extends Exception
+{
+}

app/Http/Controllers/Api/V1/ArticlesController.php

@@ -3,12 +3,13 @@
 namespace App\Http\Controllers\Api\V1;
 
 use App\Http\Resources\ArticleResource;
-use App\Jobs\ArticleDiscoveryJob;
 use App\Models\Article;
 use App\Models\Setting;
+use App\Jobs\ArticleDiscoveryJob;
 use Exception;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Artisan;
 
 class ArticlesController extends BaseController
 {
@@ -40,6 +41,40 @@ public function index(Request $request): JsonResponse
         ]);
     }
 
+    /**
+     * Approve an article
+     */
+    public function approve(Article $article): JsonResponse
+    {
+        try {
+            $article->approve('manual');
+
+            return $this->sendResponse(
+                new ArticleResource($article->fresh(['feed', 'articlePublication'])),
+                'Article approved and queued for publishing.'
+            );
+        } catch (Exception $e) {
+            return $this->sendError('Failed to approve article: ' . $e->getMessage(), [], 500);
+        }
+    }
+
+    /**
+     * Reject an article
+     */
+    public function reject(Article $article): JsonResponse
+    {
+        try {
+            $article->reject('manual');
+
+            return $this->sendResponse(
+                new ArticleResource($article->fresh(['feed', 'articlePublication'])),
+                'Article rejected.'
+            );
+        } catch (Exception $e) {
+            return $this->sendError('Failed to reject article: ' . $e->getMessage(), [], 500);
+        }
+    }
+
     /**
      * Manually refresh articles from all active feeds
      */

app/Http/Controllers/Api/V1/AuthController.php

@@ -5,6 +5,7 @@
 use App\Models\User;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Validation\ValidationException;
 

app/Http/Controllers/Api/V1/BaseController.php

@@ -23,8 +23,6 @@ public function sendResponse(mixed $result, string $message = 'Success', int $co
 
     /**
      * Error response method
-     *
-     * @param  array<string, mixed>  $errorMessages
      */
     public function sendError(string $error, array $errorMessages = [], int $code = 400): JsonResponse
     {
@@ -42,8 +40,6 @@ public function sendError(string $error, array $errorMessages = [], int $code =
 
     /**
      * Validation error response method
-     *
-     * @param  array<string, mixed>  $errors
      */
     public function sendValidationError(array $errors): JsonResponse
     {

app/Http/Controllers/Api/V1/DashboardController.php

@@ -3,6 +3,9 @@
 namespace App\Http\Controllers\Api\V1;
 
 use App\Models\Article;
+use App\Models\Feed;
+use App\Models\PlatformAccount;
+use App\Models\PlatformChannel;
 use App\Services\DashboardStatsService;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
@@ -37,6 +40,7 @@ public function stats(Request $request): JsonResponse
                 'current_period' => $period,
             ]);
         } catch (\Exception $e) {
+            throw $e;
             return $this->sendError('Failed to fetch dashboard stats: ' . $e->getMessage(), [], 500);
         }
     }

app/Http/Controllers/Api/V1/FeedsController.php

@@ -10,8 +10,8 @@
 use Exception;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
-use Illuminate\Validation\ValidationException;
 use InvalidArgumentException;
+use Illuminate\Validation\ValidationException;
 
 class FeedsController extends BaseController
 {
@@ -37,7 +37,7 @@ public function index(Request $request): JsonResponse
                 'total' => $feeds->total(),
                 'from' => $feeds->firstItem(),
                 'to' => $feeds->lastItem(),
-            ],
+            ]
         ], 'Feeds retrieved successfully.');
     }
 

app/Http/Controllers/Api/V1/OnboardingController.php

@@ -84,10 +84,8 @@ public function options(): JsonResponse
             ->get(['id', 'platform_instance_id', 'name', 'display_name', 'description']);
 
         // Get feed providers from config
-        /** @var array<string, array<string, mixed>> $providers */
-        $providers = config('feed.providers', []);
-        $feedProviders = collect($providers)
-            ->filter(fn (array $provider) => $provider['is_active'])
+        $feedProviders = collect(config('feed.providers', []))
+            ->filter(fn($provider) => $provider['is_active'])
             ->values();
 
         return $this->sendResponse([

app/Http/Controllers/Api/V1/PlatformAccountsController.php

@@ -53,7 +53,6 @@ public function store(StorePlatformAccountRequest $request, CreatePlatformAccoun
             if (str_contains($e->getMessage(), 'Rate limited by')) {
                 return $this->sendError($e->getMessage(), [], 429);
             }
-
             return $this->sendError('Invalid username or password. Please check your credentials and try again.', [], 422);
         } catch (Exception $e) {
             return $this->sendError('Unable to connect to the Lemmy instance. Please check the URL and try again.', [], 422);

app/Http/Controllers/Api/V1/PlatformChannelsController.php

@@ -5,8 +5,8 @@
 use App\Actions\CreateChannelAction;
 use App\Http\Requests\StorePlatformChannelRequest;
 use App\Http\Resources\PlatformChannelResource;
-use App\Models\PlatformAccount;
 use App\Models\PlatformChannel;
+use App\Models\PlatformAccount;
 use Exception;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
@@ -144,7 +144,6 @@ public function attachAccount(PlatformChannel $channel, Request $request): JsonR
                 'priority' => 'nullable|integer|min:1|max:100',
             ]);
 
-            /** @var PlatformAccount $platformAccount */
             $platformAccount = PlatformAccount::findOrFail($validated['platform_account_id']);
 
             // Check if account is already attached

app/Http/Controllers/Api/V1/RouteArticlesController.php

@@ -1,101 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Api\V1;
-
-use App\Enums\ApprovalStatusEnum;
-use App\Http\Resources\RouteArticleResource;
-use App\Models\RouteArticle;
-use Exception;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class RouteArticlesController extends BaseController
-{
-    public function index(Request $request): JsonResponse
-    {
-        $perPage = min($request->get('per_page', 15), 100);
-
-        $query = RouteArticle::with(['article.feed', 'feed', 'platformChannel'])
-            ->orderBy('created_at', 'desc');
-
-        if ($request->has('status')) {
-            $status = ApprovalStatusEnum::tryFrom($request->get('status'));
-            if ($status) {
-                $query->where('approval_status', $status);
-            }
-        }
-
-        $routeArticles = $query->paginate($perPage);
-
-        return $this->sendResponse([
-            'route_articles' => RouteArticleResource::collection($routeArticles->items()),
-            'pagination' => [
-                'current_page' => $routeArticles->currentPage(),
-                'last_page' => $routeArticles->lastPage(),
-                'per_page' => $routeArticles->perPage(),
-                'total' => $routeArticles->total(),
-                'from' => $routeArticles->firstItem(),
-                'to' => $routeArticles->lastItem(),
-            ],
-        ]);
-    }
-
-    public function approve(RouteArticle $routeArticle): JsonResponse
-    {
-        try {
-            $routeArticle->approve();
-
-            return $this->sendResponse(
-                new RouteArticleResource($routeArticle->fresh(['article.feed', 'feed', 'platformChannel'])),
-                'Route article approved and queued for publishing.'
-            );
-        } catch (Exception $e) {
-            return $this->sendError('Failed to approve route article: '.$e->getMessage(), [], 500);
-        }
-    }
-
-    public function reject(RouteArticle $routeArticle): JsonResponse
-    {
-        try {
-            $routeArticle->reject();
-
-            return $this->sendResponse(
-                new RouteArticleResource($routeArticle->fresh(['article.feed', 'feed', 'platformChannel'])),
-                'Route article rejected.'
-            );
-        } catch (Exception $e) {
-            return $this->sendError('Failed to reject route article: '.$e->getMessage(), [], 500);
-        }
-    }
-
-    public function restore(RouteArticle $routeArticle): JsonResponse
-    {
-        try {
-            $routeArticle->update(['approval_status' => ApprovalStatusEnum::PENDING]);
-
-            return $this->sendResponse(
-                new RouteArticleResource($routeArticle->fresh(['article.feed', 'feed', 'platformChannel'])),
-                'Route article restored to pending.'
-            );
-        } catch (Exception $e) {
-            return $this->sendError('Failed to restore route article: '.$e->getMessage(), [], 500);
-        }
-    }
-
-    public function clear(): JsonResponse
-    {
-        try {
-            $count = RouteArticle::where('approval_status', ApprovalStatusEnum::PENDING)->count();
-
-            RouteArticle::where('approval_status', ApprovalStatusEnum::PENDING)
-                ->update(['approval_status' => ApprovalStatusEnum::REJECTED]);
-
-            return $this->sendResponse(
-                ['rejected_count' => $count],
-                "Rejected {$count} pending route articles."
-            );
-        } catch (Exception $e) {
-            return $this->sendError('Failed to clear pending route articles: '.$e->getMessage(), [], 500);
-        }
-    }
-}

app/Http/Controllers/Auth/NewPasswordController.php

@@ -11,7 +11,6 @@
 use Illuminate\Support\Facades\Password;
 use Illuminate\Support\Str;
 use Illuminate\Validation\Rules;
-use Illuminate\Validation\ValidationException;
 use Illuminate\View\View;
 
 class NewPasswordController extends Controller
@@ -27,7 +26,7 @@ public function create(Request $request): View
     /**
      * Handle an incoming new password request.
      *
-     * @throws ValidationException
+     * @throws \Illuminate\Validation\ValidationException
      */
     public function store(Request $request): RedirectResponse
     {

app/Http/Controllers/Auth/PasswordResetLinkController.php

@@ -6,7 +6,6 @@
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Password;
-use Illuminate\Validation\ValidationException;
 use Illuminate\View\View;
 
 class PasswordResetLinkController extends Controller
@@ -22,7 +21,7 @@ public function create(): View
     /**
      * Handle an incoming password reset link request.
      *
-     * @throws ValidationException
+     * @throws \Illuminate\Validation\ValidationException
      */
     public function store(Request $request): RedirectResponse
     {

app/Http/Controllers/Auth/RegisteredUserController.php

@@ -10,7 +10,6 @@
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Validation\Rules;
-use Illuminate\Validation\ValidationException;
 use Illuminate\View\View;
 
 class RegisteredUserController extends Controller
@@ -26,7 +25,7 @@ public function create(): View
     /**
      * Handle an incoming registration request.
      *
-     * @throws ValidationException
+     * @throws \Illuminate\Validation\ValidationException
      */
     public function store(Request $request): RedirectResponse
     {

app/Http/Controllers/Auth/VerifyEmailController.php

@@ -4,7 +4,6 @@
 
 use App\Http\Controllers\Controller;
 use Illuminate\Auth\Events\Verified;
-use Illuminate\Contracts\Auth\MustVerifyEmail;
 use Illuminate\Foundation\Auth\EmailVerificationRequest;
 use Illuminate\Http\RedirectResponse;
 
@@ -20,9 +19,7 @@ public function __invoke(EmailVerificationRequest $request): RedirectResponse
         }
 
         if ($request->user()->markEmailAsVerified()) {
-            /** @var MustVerifyEmail $user */
-            $user = $request->user();
-            event(new Verified($user));
+            event(new Verified($request->user()));
         }
 
         return redirect()->intended(route('dashboard', absolute: false).'?verified=1');

app/Http/Middleware/HandleAppearance.php

@@ -12,7 +12,7 @@ class HandleAppearance
     /**
      * Handle an incoming request.
      *
-     * @param  Closure(Request): (Response)  $next
+     * @param  \Closure(\Illuminate\Http\Request): (\Symfony\Component\HttpFoundation\Response)  $next
      */
     public function handle(Request $request, Closure $next): Response
     {

app/Http/Requests/Auth/LoginRequest.php

@@ -3,7 +3,6 @@
 namespace App\Http\Requests\Auth;
 
 use Illuminate\Auth\Events\Lockout;
-use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\RateLimiter;
@@ -23,7 +22,7 @@ public function authorize(): bool
     /**
      * Get the validation rules that apply to the request.
      *
-     * @return array<string, ValidationRule|array<mixed>|string>
+     * @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
      */
     public function rules(): array
     {
@@ -36,7 +35,7 @@ public function rules(): array
     /**
      * Attempt to authenticate the request's credentials.
      *
-     * @throws ValidationException
+     * @throws \Illuminate\Validation\ValidationException
      */
     public function authenticate(): void
     {
@@ -56,7 +55,7 @@ public function authenticate(): void
     /**
      * Ensure the login request is not rate limited.
      *
-     * @throws ValidationException
+     * @throws \Illuminate\Validation\ValidationException
      */
     public function ensureIsNotRateLimited(): void
     {

app/Http/Requests/ProfileUpdateRequest.php

@@ -3,7 +3,6 @@
 namespace App\Http\Requests;
 
 use App\Models\User;
-use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
 
@@ -12,7 +11,7 @@ class ProfileUpdateRequest extends FormRequest
     /**
      * Get the validation rules that apply to the request.
      *
-     * @return array<string, ValidationRule|array<mixed>|string>
+     * @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
      */
     public function rules(): array
     {

app/Http/Requests/StoreFeedRequest.php

@@ -23,7 +23,7 @@ public function rules(): array
             'provider' => "required|in:{$providers}",
             'language_id' => 'required|exists:languages,id',
             'description' => 'nullable|string',
-            'is_active' => 'boolean',
+            'is_active' => 'boolean'
         ];
     }
 }

app/Http/Requests/UpdateFeedRequest.php

@@ -23,7 +23,7 @@ public function rules(): array
             'type' => 'required|in:website,rss',
             'language_id' => 'required|exists:languages,id',
             'description' => 'nullable|string',
-            'is_active' => 'boolean',
+            'is_active' => 'boolean'
         ];
     }
 }

app/Http/Resources/ArticlePublicationResource.php

@@ -2,13 +2,9 @@
 
 namespace App\Http\Resources;
 
-use App\Models\ArticlePublication;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
-/**
- * @mixin ArticlePublication
- */
 class ArticlePublicationResource extends JsonResource
 {
     /**
@@ -21,8 +17,8 @@ public function toArray(Request $request): array
         return [
             'id' => $this->id,
             'article_id' => $this->article_id,
-            'platform' => $this->platform,
-            'published_at' => $this->published_at->toISOString(),
+            'status' => $this->status,
+            'published_at' => $this->published_at?->toISOString(),
             'created_at' => $this->created_at->toISOString(),
             'updated_at' => $this->updated_at->toISOString(),
         ];

app/Http/Resources/ArticleResource.php

@@ -2,18 +2,14 @@
 
 namespace App\Http\Resources;
 
-use App\Models\Article;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
 /**
- * @mixin Article
+ * @property int $id
  */
 class ArticleResource extends JsonResource
 {
-    /**
-     * @return array<string, mixed>
-     */
     public function toArray(Request $request): array
     {
         return [
@@ -22,6 +18,13 @@ public function toArray(Request $request): array
             'url' => $this->url,
             'title' => $this->title,
             'description' => $this->description,
+            'is_valid' => $this->is_valid,
+            'is_duplicate' => $this->is_duplicate,
+            'approval_status' => $this->approval_status,
+            'publish_status' => $this->publish_status,
+            'approved_at' => $this->approved_at?->toISOString(),
+            'approved_by' => $this->approved_by,
+            'fetched_at' => $this->fetched_at?->toISOString(),
             'validated_at' => $this->validated_at?->toISOString(),
             'is_published' => $this->relationLoaded('articlePublication') && $this->articlePublication !== null,
             'created_at' => $this->created_at->toISOString(),

app/Http/Resources/FeedResource.php

@@ -2,13 +2,9 @@
 
 namespace App\Http\Resources;
 
-use App\Models\Feed;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
-/**
- * @mixin Feed
- */
 class FeedResource extends JsonResource
 {
     /**

app/Http/Resources/PlatformAccountResource.php

@@ -2,16 +2,9 @@
 
 namespace App\Http\Resources;
 
-use App\Models\PlatformAccount;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
-/**
- * @mixin PlatformAccount
- */
-/**
- * @mixin PlatformAccount
- */
 class PlatformAccountResource extends JsonResource
 {
     /**

app/Http/Resources/PlatformChannelResource.php

@@ -2,13 +2,9 @@
 
 namespace App\Http\Resources;
 
-use App\Models\PlatformChannel;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
-/**
- * @mixin PlatformChannel
- */
 class PlatformChannelResource extends JsonResource
 {
     /**

app/Http/Resources/PlatformInstanceResource.php

@@ -2,13 +2,9 @@
 
 namespace App\Http\Resources;
 
-use App\Models\PlatformInstance;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
-/**
- * @mixin PlatformInstance
- */
 class PlatformInstanceResource extends JsonResource
 {
     /**

app/Http/Resources/RouteArticleResource.php

@@ -1,39 +0,0 @@
-<?php
-
-namespace App\Http\Resources;
-
-use App\Models\RouteArticle;
-use Illuminate\Http\Request;
-use Illuminate\Http\Resources\Json\JsonResource;
-
-/**
- * @mixin RouteArticle
- */
-class RouteArticleResource extends JsonResource
-{
-    /**
-     * @return array<string, mixed>
-     */
-    public function toArray(Request $request): array
-    {
-        return [
-            'id' => $this->id,
-            'feed_id' => $this->feed_id,
-            'platform_channel_id' => $this->platform_channel_id,
-            'article_id' => $this->article_id,
-            'approval_status' => $this->approval_status->value,
-            'publish_status' => $this->publish_status->value,
-            'validated_at' => $this->validated_at?->toISOString(),
-            'created_at' => $this->created_at->toISOString(),
-            'updated_at' => $this->updated_at->toISOString(),
-            'article' => [
-                'id' => $this->article->id,
-                'title' => $this->article->title,
-                'url' => $this->article->url,
-                'description' => $this->article->description,
-                'feed_name' => $this->article->feed->name,
-            ],
-            'route_name' => $this->feed->name.' → '.$this->platformChannel->name,
-        ];
-    }
-}

app/Http/Resources/RouteResource.php

@@ -2,13 +2,9 @@
 
 namespace App\Http\Resources;
 
-use App\Models\Route;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
-/**
- * @mixin Route
- */
 class RouteResource extends JsonResource
 {
     /**
@@ -19,6 +15,7 @@ class RouteResource extends JsonResource
     public function toArray(Request $request): array
     {
         return [
+            'id' => $this->id,
             'feed_id' => $this->feed_id,
             'platform_channel_id' => $this->platform_channel_id,
             'is_active' => $this->is_active,

app/Jobs/ArticleDiscoveryForFeedJob.php

@@ -25,7 +25,7 @@ public function handle(LogSaver $logSaver, ArticleFetcher $articleFetcher): void
         $logSaver->info('Starting feed article fetch', null, [
             'feed_id' => $this->feed->id,
             'feed_name' => $this->feed->name,
-            'feed_url' => $this->feed->url,
+            'feed_url' => $this->feed->url
         ]);
 
         $articles = $articleFetcher->getArticlesFromFeed($this->feed);
@@ -33,7 +33,7 @@ public function handle(LogSaver $logSaver, ArticleFetcher $articleFetcher): void
         $logSaver->info('Feed article fetch completed', null, [
             'feed_id' => $this->feed->id,
             'feed_name' => $this->feed->name,
-            'articles_count' => $articles->count(),
+            'articles_count' => $articles->count()
         ]);
 
         $this->feed->update(['last_fetched_at' => now()]);
@@ -56,7 +56,7 @@ public static function dispatchForAllActiveFeeds(): void
                 $logSaver->info('Dispatched feed discovery job', null, [
                     'feed_id' => $feed->id,
                     'feed_name' => $feed->name,
-                    'delay_minutes' => $delayMinutes,
+                    'delay_minutes' => $delayMinutes
                 ]);
             });
     }

app/Jobs/CheckFeedStalenessJob.php

@@ -1,51 +0,0 @@
-<?php
-
-namespace App\Jobs;
-
-use App\Enums\NotificationSeverityEnum;
-use App\Enums\NotificationTypeEnum;
-use App\Models\Feed;
-use App\Models\Notification;
-use App\Models\Setting;
-use App\Services\Notification\NotificationService;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Queue\Queueable;
-
-class CheckFeedStalenessJob implements ShouldQueue
-{
-    use Queueable;
-
-    public function handle(NotificationService $notificationService): void
-    {
-        $thresholdHours = Setting::getFeedStalenessThreshold();
-
-        if ($thresholdHours === 0) {
-            return;
-        }
-
-        $staleFeeds = Feed::stale($thresholdHours)->get();
-
-        foreach ($staleFeeds as $feed) {
-            $alreadyNotified = Notification::query()
-                ->where('type', NotificationTypeEnum::FEED_STALE)
-                ->where('notifiable_type', $feed->getMorphClass())
-                ->where('notifiable_id', $feed->getKey())
-                ->unread()
-                ->exists();
-
-            if ($alreadyNotified) {
-                continue;
-            }
-
-            $notificationService->send(
-                type: NotificationTypeEnum::FEED_STALE,
-                severity: NotificationSeverityEnum::WARNING,
-                title: "Feed \"{$feed->name}\" is stale",
-                message: $feed->last_fetched_at
-                    ? "Last fetched {$feed->last_fetched_at->diffForHumans()}. Threshold is {$thresholdHours} hours."
-                    : "This feed has never been fetched. Threshold is {$thresholdHours} hours.",
-                notifiable: $feed,
-            );
-        }
-    }
-}

app/Jobs/CleanupArticlesJob.php

@@ -1,25 +0,0 @@
-<?php
-
-namespace App\Jobs;
-
-use App\Enums\ApprovalStatusEnum;
-use App\Models\Article;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Queue\Queueable;
-
-class CleanupArticlesJob implements ShouldQueue
-{
-    use Queueable;
-
-    private const RETENTION_DAYS = 30;
-
-    public function handle(): void
-    {
-        Article::where('created_at', '<', now()->subDays(self::RETENTION_DAYS))
-            ->whereDoesntHave('routeArticles', fn ($q) => $q->whereIn('approval_status', [
-                ApprovalStatusEnum::PENDING,
-                ApprovalStatusEnum::APPROVED,
-            ]))
-            ->delete();
-    }
-}

app/Jobs/PublishNextArticleJob.php

@@ -2,24 +2,17 @@
 
 namespace App\Jobs;
 
-use App\Enums\ApprovalStatusEnum;
-use App\Enums\LogLevelEnum;
-use App\Enums\NotificationSeverityEnum;
-use App\Enums\NotificationTypeEnum;
-use App\Enums\PublishStatusEnum;
-use App\Events\ActionPerformed;
 use App\Exceptions\PublishException;
+use App\Models\Article;
 use App\Models\ArticlePublication;
-use App\Models\RouteArticle;
 use App\Models\Setting;
 use App\Services\Article\ArticleFetcher;
-use App\Services\Notification\NotificationService;
 use App\Services\Publishing\ArticlePublishingService;
 use Illuminate\Contracts\Queue\ShouldBeUnique;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Queue\Queueable;
 
-class PublishNextArticleJob implements ShouldBeUnique, ShouldQueue
+class PublishNextArticleJob implements ShouldQueue, ShouldBeUnique
 {
     use Queueable;
 
@@ -35,10 +28,9 @@ public function __construct()
 
     /**
      * Execute the job.
-     *
      * @throws PublishException
      */
-    public function handle(ArticleFetcher $articleFetcher, ArticlePublishingService $publishingService, NotificationService $notificationService): void
+    public function handle(ArticleFetcher $articleFetcher, ArticlePublishingService $publishingService): void
     {
         $interval = Setting::getArticlePublishingInterval();
 
@@ -50,73 +42,39 @@ public function handle(ArticleFetcher $articleFetcher, ArticlePublishingService
             }
         }
 
-        // Get the oldest approved route_article that hasn't been published to its channel yet
-        $routeArticle = RouteArticle::where('approval_status', ApprovalStatusEnum::APPROVED)
-            ->whereDoesntHave('article.articlePublications', function ($query) {
-                $query->whereColumn('article_publications.platform_channel_id', 'route_articles.platform_channel_id');
-            })
-            ->oldest('route_articles.created_at')
-            ->with(['article', 'platformChannel.platformInstance', 'platformChannel.activePlatformAccounts'])
+        // Get the oldest approved article that hasn't been published yet
+        $article = Article::where('approval_status', 'approved')
+            ->whereDoesntHave('articlePublication')
+            ->oldest('created_at')
             ->first();
 
-        if (! $routeArticle) {
+        if (! $article) {
             return;
         }
 
-        $article = $routeArticle->article;
-
-        ActionPerformed::dispatch('Publishing next article from scheduled job', LogLevelEnum::INFO, [
+        logger()->info('Publishing next article from scheduled job', [
             'article_id' => $article->id,
             'title' => $article->title,
             'url' => $article->url,
-            'route' => $routeArticle->feed_id.'-'.$routeArticle->platform_channel_id,
+            'created_at' => $article->created_at
         ]);
 
-        $routeArticle->update(['publish_status' => PublishStatusEnum::PUBLISHING]);
+        // Fetch article data
+        $extractedData = $articleFetcher->fetchArticleData($article);
 
         try {
-            $extractedData = $articleFetcher->fetchArticleData($article);
-            $publication = $publishingService->publishRouteArticle($routeArticle, $extractedData);
+            $publishingService->publishToRoutedChannels($article, $extractedData);
             
-            if ($publication) {
-                $routeArticle->update(['publish_status' => PublishStatusEnum::PUBLISHED]);
-
-                ActionPerformed::dispatch('Successfully published article', LogLevelEnum::INFO, [
+            logger()->info('Successfully published article', [
                 'article_id' => $article->id,
-                    'title' => $article->title,
+                'title' => $article->title
             ]);
-            } else {
-                $routeArticle->update(['publish_status' => PublishStatusEnum::ERROR]);
-
-                ActionPerformed::dispatch('No publication created for article', LogLevelEnum::WARNING, [
-                    'article_id' => $article->id,
-                    'title' => $article->title,
-                ]);
-
-                $notificationService->send(
-                    NotificationTypeEnum::PUBLISH_FAILED,
-                    NotificationSeverityEnum::WARNING,
-                    "Publish failed: {$article->title}",
-                    'No publication was created for this article. Check channel routing configuration.',
-                    $article,
-                );
-            }
         } catch (PublishException $e) {
-            $routeArticle->update(['publish_status' => PublishStatusEnum::ERROR]);
-
-            ActionPerformed::dispatch('Failed to publish article', LogLevelEnum::ERROR, [
+            logger()->error('Failed to publish article', [
                 'article_id' => $article->id,
-                'error' => $e->getMessage(),
+                'error' => $e->getMessage()
             ]);
             
-            $notificationService->send(
-                NotificationTypeEnum::PUBLISH_FAILED,
-                NotificationSeverityEnum::ERROR,
-                "Publish failed: {$article->title}",
-                $e->getMessage(),
-                $article,
-            );
-
             throw $e;
         }
     }

app/Jobs/SyncChannelPostsJob.php

@@ -15,7 +15,7 @@
 use Illuminate\Foundation\Queue\Queueable;
 use Illuminate\Support\Facades\Cache;
 
-class SyncChannelPostsJob implements ShouldBeUnique, ShouldQueue
+class SyncChannelPostsJob implements ShouldQueue, ShouldBeUnique
 {
     use Queueable;
 
@@ -78,7 +78,7 @@ private function syncLemmyChannelPosts(LogSaver $logSaver): void
 
         } catch (Exception $e) {
             $logSaver->error('Failed to sync channel posts', $this->channel, [
-                'error' => $e->getMessage(),
+                'error' => $e->getMessage()
             ]);
 
             throw $e;

app/Listeners/LogActionListener.php

@@ -1,21 +0,0 @@
-<?php
-
-namespace App\Listeners;
-
-use App\Events\ActionPerformed;
-use App\Services\Log\LogSaver;
-use Exception;
-
-class LogActionListener
-{
-    public function __construct(private LogSaver $logSaver) {}
-
-    public function handle(ActionPerformed $event): void
-    {
-        try {
-            $this->logSaver->log($event->level, $event->message, context: $event->context);
-        } catch (Exception $e) {
-            error_log('Failed to log action to database: '.$e->getMessage());
-        }
-    }
-}

app/Listeners/LogExceptionToDatabase.php

@@ -5,9 +5,9 @@
 use App\Events\ExceptionLogged;
 use App\Events\ExceptionOccurred;
 use App\Models\Log;
-
 class LogExceptionToDatabase
 {
+
     public function handle(ExceptionOccurred $event): void
     {
         // Truncate the message to prevent database errors
@@ -24,15 +24,15 @@ public function handle(ExceptionOccurred $event): void
                     'file' => $event->exception->getFile(),
                     'line' => $event->exception->getLine(),
                     'trace' => $event->exception->getTraceAsString(),
-                    ...$event->context,
-                ],
+                    ...$event->context
+                ]
             ]);
 
             ExceptionLogged::dispatch($log);
         } catch (\Exception $e) {
             // Prevent infinite recursion by not logging this exception
             // Optionally log to file or other non-database destination
-            error_log('Failed to log exception to database: '.$e->getMessage());
+            error_log("Failed to log exception to database: " . $e->getMessage());
         }
     }
 }

app/Listeners/PublishApprovedArticleListener.php

@@ -2,14 +2,8 @@
 
 namespace App\Listeners;
 
-use App\Enums\LogLevelEnum;
-use App\Enums\NotificationSeverityEnum;
-use App\Enums\NotificationTypeEnum;
-use App\Enums\PublishStatusEnum;
-use App\Events\ActionPerformed;
-use App\Events\RouteArticleApproved;
+use App\Events\ArticleApproved;
 use App\Services\Article\ArticleFetcher;
-use App\Services\Notification\NotificationService;
 use App\Services\Publishing\ArticlePublishingService;
 use Exception;
 use Illuminate\Contracts\Queue\ShouldQueue;
@@ -20,67 +14,51 @@ class PublishApprovedArticleListener implements ShouldQueue
 
     public function __construct(
         private ArticleFetcher $articleFetcher,
-        private ArticlePublishingService $publishingService,
-        private NotificationService $notificationService,
+        private ArticlePublishingService $publishingService
     ) {}
 
-    public function handle(RouteArticleApproved $event): void
+    public function handle(ArticleApproved $event): void
     {
-        $routeArticle = $event->routeArticle;
-        $article = $routeArticle->article;
+        $article = $event->article->fresh();
 
-        // Skip if already published to this channel
-        if ($article->articlePublications()
-            ->where('platform_channel_id', $routeArticle->platform_channel_id)
-            ->exists()
-        ) {
+        // Skip if already published
+        if ($article->articlePublication()->exists()) {
             return;
         }
 
-        $routeArticle->update(['publish_status' => PublishStatusEnum::PUBLISHING]);
+        // Skip if not approved (safety check)
+        if (! $article->isApproved()) {
+            return;
+        }
+
+        $article->update(['publish_status' => 'publishing']);
 
         try {
             $extractedData = $this->articleFetcher->fetchArticleData($article);
-            $publication = $this->publishingService->publishRouteArticle($routeArticle, $extractedData);
+            $publications = $this->publishingService->publishToRoutedChannels($article, $extractedData);
 
-            if ($publication) {
-                $routeArticle->update(['publish_status' => PublishStatusEnum::PUBLISHED]);
+            if ($publications->isNotEmpty()) {
+                $article->update(['publish_status' => 'published']);
 
-                ActionPerformed::dispatch('Published approved article', LogLevelEnum::INFO, [
+                logger()->info('Published approved article', [
                     'article_id' => $article->id,
                     'title' => $article->title,
                 ]);
             } else {
-                $routeArticle->update(['publish_status' => PublishStatusEnum::ERROR]);
+                $article->update(['publish_status' => 'error']);
 
-                ActionPerformed::dispatch('No publication created for approved article', LogLevelEnum::WARNING, [
+                logger()->warning('No publications created for approved article', [
                     'article_id' => $article->id,
                     'title' => $article->title,
                 ]);
-
-                $this->notificationService->send(
-                    NotificationTypeEnum::PUBLISH_FAILED,
-                    NotificationSeverityEnum::WARNING,
-                    "Publish failed: {$article->title}",
-                    'No publication was created for this article. Check channel routing configuration.',
-                    $article,
-                );
             }
         } catch (Exception $e) {
-            $routeArticle->update(['publish_status' => PublishStatusEnum::ERROR]);
+            $article->update(['publish_status' => 'error']);
 
-            ActionPerformed::dispatch('Failed to publish approved article', LogLevelEnum::ERROR, [
+            logger()->error('Failed to publish approved article', [
                 'article_id' => $article->id,
                 'error' => $e->getMessage(),
             ]);
-
-            $this->notificationService->send(
-                NotificationTypeEnum::PUBLISH_FAILED,
-                NotificationSeverityEnum::ERROR,
-                "Publish failed: {$article->title}",
-                $e->getMessage(),
-                $article,
-            );
         }
     }
 }

app/Listeners/ValidateArticleListener.php

@@ -2,9 +2,8 @@
 
 namespace App\Listeners;
 
-use App\Enums\LogLevelEnum;
-use App\Events\ActionPerformed;
 use App\Events\NewArticleFetched;
+use App\Models\Setting;
 use App\Services\Article\ValidationService;
 use Exception;
 use Illuminate\Contracts\Queue\ShouldQueue;
@@ -25,18 +24,37 @@ public function handle(NewArticleFetched $event): void
             return;
         }
 
+        // Only validate articles that are still pending
+        if (! $article->isPending()) {
+            return;
+        }
+
         // Skip if already has publication (prevents duplicate processing)
         if ($article->articlePublication()->exists()) {
             return;
         }
 
         try {
-            $this->validationService->validate($article);
+            $article = $this->validationService->validate($article);
         } catch (Exception $e) {
-            ActionPerformed::dispatch('Article validation failed', LogLevelEnum::ERROR, [
+            logger()->error('Article validation failed', [
                 'article_id' => $article->id,
                 'error' => $e->getMessage(),
             ]);
+            return;
+        }
+
+        if ($article->isValid()) {
+            // Double-check publication doesn't exist (race condition protection)
+            if ($article->articlePublication()->exists()) {
+                return;
+            }
+
+            // If approvals are enabled, article waits for manual approval.
+            // If approvals are disabled, auto-approve and publish.
+            if (! Setting::isPublishingApprovalsEnabled()) {
+                $article->approve();
+            }
         }
     }
 }

app/Livewire/Articles.php

@@ -2,10 +2,9 @@
 
 namespace App\Livewire;
 
-use App\Enums\ApprovalStatusEnum;
+use App\Models\Article;
+use App\Models\Setting;
 use App\Jobs\ArticleDiscoveryJob;
-use App\Models\RouteArticle;
-use Illuminate\Contracts\View\View;
 use Livewire\Component;
 use Livewire\WithPagination;
 
@@ -13,44 +12,22 @@ class Articles extends Component
 {
     use WithPagination;
 
-    public string $tab = 'pending';
-
-    public string $search = '';
-
     public bool $isRefreshing = false;
 
-    public function setTab(string $tab): void
+    public function approve(int $articleId): void
     {
-        $this->tab = $tab;
-        $this->search = '';
-        $this->resetPage();
+        $article = Article::findOrFail($articleId);
+        $article->approve();
+
+        $this->dispatch('article-updated');
     }
 
-    public function updatedSearch(): void
+    public function reject(int $articleId): void
     {
-        $this->resetPage();
-    }
+        $article = Article::findOrFail($articleId);
+        $article->reject();
 
-    public function approve(int $routeArticleId): void
-    {
-        RouteArticle::findOrFail($routeArticleId)->approve();
-    }
-
-    public function reject(int $routeArticleId): void
-    {
-        RouteArticle::findOrFail($routeArticleId)->reject();
-    }
-
-    public function restore(int $routeArticleId): void
-    {
-        $routeArticle = RouteArticle::findOrFail($routeArticleId);
-        $routeArticle->update(['approval_status' => ApprovalStatusEnum::PENDING]);
-    }
-
-    public function clear(): void
-    {
-        RouteArticle::where('approval_status', ApprovalStatusEnum::PENDING)
-            ->update(['approval_status' => ApprovalStatusEnum::REJECTED]);
+        $this->dispatch('article-updated');
     }
 
     public function refresh(): void
@@ -62,28 +39,17 @@ public function refresh(): void
         $this->dispatch('refresh-started');
     }
 
-    public function render(): View
+    public function render()
     {
-        $query = RouteArticle::with(['article.feed', 'feed', 'platformChannel'])
-            ->orderBy('created_at', 'desc');
+        $articles = Article::with(['feed', 'articlePublication'])
+            ->orderBy('created_at', 'desc')
+            ->paginate(15);
 
-        if ($this->tab === 'pending') {
-            $query->where('approval_status', ApprovalStatusEnum::PENDING);
-        } elseif ($this->search !== '') {
-            $search = $this->search;
-            $query->whereHas('article', function ($q) use ($search) {
-                $q->where('title', 'like', "%{$search}%")
-                    ->orWhere('description', 'like', "%{$search}%");
-            });
-        }
-
-        $routeArticles = $query->paginate(15);
-
-        $pendingCount = RouteArticle::where('approval_status', ApprovalStatusEnum::PENDING)->count();
+        $approvalsEnabled = Setting::isPublishingApprovalsEnabled();
 
         return view('livewire.articles', [
-            'routeArticles' => $routeArticles,
-            'pendingCount' => $pendingCount,
+            'articles' => $articles,
+            'approvalsEnabled' => $approvalsEnabled,
         ])->layout('layouts.app');
     }
 }

app/Livewire/Channels.php

@@ -4,7 +4,6 @@
 
 use App\Models\PlatformAccount;
 use App\Models\PlatformChannel;
-use Illuminate\Contracts\View\View;
 use Livewire\Component;
 
 class Channels extends Component
@@ -52,7 +51,7 @@ public function detachAccount(int $channelId, int $accountId): void
         $channel->platformAccounts()->detach($accountId);
     }
 
-    public function render(): View
+    public function render()
     {
         $channels = PlatformChannel::with(['platformInstance', 'platformAccounts'])->orderBy('name')->get();
         $allAccounts = PlatformAccount::where('is_active', true)->get();

app/Livewire/Dashboard.php

@@ -3,7 +3,6 @@
 namespace App\Livewire;
 
 use App\Services\DashboardStatsService;
-use Illuminate\Contracts\View\View;
 use Livewire\Component;
 
 class Dashboard extends Component
@@ -20,7 +19,7 @@ public function setPeriod(string $period): void
         $this->period = $period;
     }
 
-    public function render(): View
+    public function render()
     {
         $service = app(DashboardStatsService::class);
 

app/Livewire/Feeds.php

@@ -3,7 +3,6 @@
 namespace App\Livewire;
 
 use App\Models\Feed;
-use Illuminate\Contracts\View\View;
 use Livewire\Component;
 
 class Feeds extends Component
@@ -15,7 +14,7 @@ public function toggle(int $feedId): void
         $feed->save();
     }
 
-    public function render(): View
+    public function render()
     {
         $feeds = Feed::orderBy('name')->get();
 

app/Livewire/NotificationBell.php

@@ -1,42 +0,0 @@
-<?php
-
-namespace App\Livewire;
-
-use App\Models\Notification;
-use Illuminate\Contracts\View\View;
-use Illuminate\Database\Eloquent\Collection;
-use Livewire\Attributes\Computed;
-use Livewire\Component;
-
-class NotificationBell extends Component
-{
-    public function markAsRead(int $id): void
-    {
-        Notification::findOrFail($id)->markAsRead();
-    }
-
-    public function markAllAsRead(): void
-    {
-        Notification::markAllAsRead();
-    }
-
-    #[Computed]
-    public function unreadCount(): int
-    {
-        return Notification::unread()->count();
-    }
-
-    /**
-     * @return Collection<int, Notification>
-     */
-    #[Computed]
-    public function notifications(): Collection
-    {
-        return Notification::recent()->get();
-    }
-
-    public function render(): View
-    {
-        return view('livewire.notification-bell');
-    }
-}

app/Livewire/Onboarding.php

@@ -18,9 +18,7 @@
 use App\Models\Setting;
 use App\Services\OnboardingService;
 use Exception;
-use Illuminate\Contracts\View\View;
 use InvalidArgumentException;
-use Livewire\Attributes\Locked;
 use Livewire\Component;
 use RuntimeException;
 
@@ -31,54 +29,36 @@ class Onboarding extends Component
 
     // Platform form
     public string $instanceUrl = '';
-
     public string $username = '';
-
     public string $password = '';
-
-    /** @var array<string, mixed>|null */
     public ?array $existingAccount = null;
 
     // Feed form
     public string $feedName = '';
-
     public string $feedProvider = 'vrt';
-
     public ?int $feedLanguageId = null;
-
     public string $feedDescription = '';
 
     // Channel form
     public string $channelName = '';
-
     public ?int $platformInstanceId = null;
-
     public ?int $channelLanguageId = null;
-
     public string $channelDescription = '';
 
     // Route form
     public ?int $routeFeedId = null;
-
     public ?int $routeChannelId = null;
-
     public int $routePriority = 50;
 
     // State
-    /** @var array<string, string> */
     public array $formErrors = [];
-
     public bool $isLoading = false;
-
-    #[Locked]
+    #[\Livewire\Attributes\Locked]
     public ?int $previousChannelLanguageId = null;
 
     protected CreatePlatformAccountAction $createPlatformAccountAction;
-
     protected CreateFeedAction $createFeedAction;
-
     protected CreateChannelAction $createChannelAction;
-
     protected CreateRouteAction $createRouteAction;
 
     public function boot(
@@ -339,9 +319,6 @@ public function completeOnboarding(): void
     /**
      * Get language codes that have at least one active provider.
      */
-    /**
-     * @return list<string>
-     */
     public function getAvailableLanguageCodes(): array
     {
         $providers = config('feed.providers', []);
@@ -352,7 +329,7 @@ public function getAvailableLanguageCodes(): array
                 continue;
             }
             foreach (array_keys($provider['languages'] ?? []) as $code) {
-                $languageCodes[(string) $code] = true;
+                $languageCodes[$code] = true;
             }
         }
 
@@ -362,9 +339,6 @@ public function getAvailableLanguageCodes(): array
     /**
      * Get providers available for the current channel language.
      */
-    /**
-     * @return array<int, array<string, string>>
-     */
     public function getProvidersForLanguage(): array
     {
         if (!$this->channelLanguageId) {
@@ -404,11 +378,10 @@ public function getChannelLanguage(): ?Language
         if (!$this->channelLanguageId) {
             return null;
         }
-
         return Language::find($this->channelLanguageId);
     }
 
-    public function render(): View
+    public function render()
     {
         // For channel step: only show languages that have providers
         $availableCodes = $this->getAvailableLanguageCodes();

app/Livewire/Routes.php

@@ -6,32 +6,24 @@
 use App\Models\Keyword;
 use App\Models\PlatformChannel;
 use App\Models\Route;
-use Illuminate\Contracts\View\View;
 use Livewire\Component;
 
 class Routes extends Component
 {
     public bool $showCreateModal = false;
-
     public ?int $editingFeedId = null;
-
     public ?int $editingChannelId = null;
 
     // Create form
     public ?int $newFeedId = null;
-
     public ?int $newChannelId = null;
-
     public int $newPriority = 50;
 
     // Edit form
     public int $editPriority = 50;
 
-    public string $editAutoApprove = '';
-
     // Keyword management
     public string $newKeyword = '';
-
     public bool $showKeywordInput = false;
 
     public function openCreateModal(): void
@@ -61,7 +53,6 @@ public function createRoute(): void
 
         if ($exists) {
             $this->addError('newFeedId', 'This route already exists.');
-
             return;
         }
 
@@ -84,7 +75,6 @@ public function openEditModal(int $feedId, int $channelId): void
         $this->editingFeedId = $feedId;
         $this->editingChannelId = $channelId;
         $this->editPriority = $route->priority;
-        $this->editAutoApprove = $route->auto_approve === null ? '' : ($route->auto_approve ? '1' : '0');
         $this->newKeyword = '';
         $this->showKeywordInput = false;
     }
@@ -105,18 +95,9 @@ public function updateRoute(): void
             'editPriority' => 'required|integer|min:0',
         ]);
 
-        $autoApprove = match ($this->editAutoApprove) {
-            '1' => true,
-            '0' => false,
-            default => null,
-        };
-
         Route::where('feed_id', $this->editingFeedId)
             ->where('platform_channel_id', $this->editingChannelId)
-            ->update([
-                'priority' => $this->editPriority,
-                'auto_approve' => $autoApprove,
-            ]);
+            ->update(['priority' => $this->editPriority]);
 
         $this->closeEditModal();
     }
@@ -172,9 +153,9 @@ public function deleteKeyword(int $keywordId): void
         Keyword::destroy($keywordId);
     }
 
-    public function render(): View
+    public function render()
     {
-        $routes = Route::with(['feed', 'platformChannel.platformInstance'])
+        $routes = Route::with(['feed', 'platformChannel'])
             ->orderBy('priority', 'desc')
             ->get();
 
@@ -187,8 +168,7 @@ public function render(): View
 
         $routes = $routes->map(function ($route) use ($allKeywords) {
             $key = $route->feed_id . '-' . $route->platform_channel_id;
-            $route->setRelation('keywords', $allKeywords->get($key, collect()));
-
+            $route->keywords = $allKeywords->get($key, collect());
             return $route;
         });
 
@@ -199,7 +179,7 @@ public function render(): View
         $editingKeywords = collect();
 
         if ($this->editingFeedId && $this->editingChannelId) {
-            $editingRoute = Route::with(['feed', 'platformChannel.platformInstance'])
+            $editingRoute = Route::with(['feed', 'platformChannel'])
                 ->where('feed_id', $this->editingFeedId)
                 ->where('platform_channel_id', $this->editingChannelId)
                 ->first();

app/Livewire/Settings.php

@@ -3,21 +3,15 @@
 namespace App\Livewire;
 
 use App\Models\Setting;
-use Illuminate\Contracts\View\View;
 use Livewire\Component;
 
 class Settings extends Component
 {
     public bool $articleProcessingEnabled = true;
-
     public bool $publishingApprovalsEnabled = false;
-
     public int $articlePublishingInterval = 5;
 
-    public int $feedStalenessThreshold = 48;
-
     public ?string $successMessage = null;
-
     public ?string $errorMessage = null;
 
     public function mount(): void
@@ -25,7 +19,6 @@ public function mount(): void
         $this->articleProcessingEnabled = Setting::isArticleProcessingEnabled();
         $this->publishingApprovalsEnabled = Setting::isPublishingApprovalsEnabled();
         $this->articlePublishingInterval = Setting::getArticlePublishingInterval();
-        $this->feedStalenessThreshold = Setting::getFeedStalenessThreshold();
     }
 
     public function toggleArticleProcessing(): void
@@ -52,16 +45,6 @@ public function updateArticlePublishingInterval(): void
         $this->showSuccess();
     }
 
-    public function updateFeedStalenessThreshold(): void
-    {
-        $this->validate([
-            'feedStalenessThreshold' => 'required|integer|min:0',
-        ]);
-
-        Setting::setFeedStalenessThreshold($this->feedStalenessThreshold);
-        $this->showSuccess();
-    }
-
     protected function showSuccess(): void
     {
         $this->successMessage = 'Settings updated successfully!';
@@ -77,7 +60,7 @@ public function clearMessages(): void
         $this->errorMessage = null;
     }
 
-    public function render(): View
+    public function render()
     {
         return view('livewire.settings')->layout('layouts.app');
     }

app/Models/Article.php

@@ -2,12 +2,12 @@
 
 namespace App\Models;
 
+use App\Events\ArticleApproved;
 use App\Events\NewArticleFetched;
 use Database\Factories\ArticleFactory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
-use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\HasOne;
 use Illuminate\Support\Carbon;
 
@@ -15,17 +15,15 @@
  * @method static firstOrCreate(array<string, mixed> $array)
  * @method static where(string $string, string $url)
  * @method static create(array<string, mixed> $array)
- *
- * @property int $id
+ * @property integer $id
  * @property int $feed_id
  * @property Feed $feed
  * @property string $url
- * @property string $title
- * @property string|null $description
+ * @property bool|null $is_valid
  * @property Carbon|null $validated_at
  * @property Carbon $created_at
  * @property Carbon $updated_at
- * @property ArticlePublication|null $articlePublication
+ * @property ArticlePublication $articlePublication
  */
 class Article extends Model
 {
@@ -41,7 +39,9 @@ class Article extends Model
         'image_url',
         'published_at',
         'author',
+        'approval_status',
         'validated_at',
+        'publish_status',
     ];
 
     /**
@@ -50,6 +50,8 @@ class Article extends Model
     public function casts(): array
     {
         return [
+            'approval_status' => 'string',
+            'publish_status' => 'string',
             'published_at' => 'datetime',
             'validated_at' => 'datetime',
             'created_at' => 'datetime',
@@ -57,6 +59,58 @@ public function casts(): array
         ];
     }
 
+    public function isValid(): bool
+    {
+        return $this->validated_at !== null && ! $this->isRejected();
+    }
+
+    public function isApproved(): bool
+    {
+        return $this->approval_status === 'approved';
+    }
+
+    public function isPending(): bool
+    {
+        return $this->approval_status === 'pending';
+    }
+
+    public function isRejected(): bool
+    {
+        return $this->approval_status === 'rejected';
+    }
+
+    public function approve(string $approvedBy = null): void
+    {
+        $this->update([
+            'approval_status' => 'approved',
+        ]);
+
+        // Fire event to trigger publishing
+        event(new ArticleApproved($this));
+    }
+
+    public function reject(string $rejectedBy = null): void
+    {
+        $this->update([
+            'approval_status' => 'rejected',
+        ]);
+    }
+
+    public function canBePublished(): bool
+    {
+        if (!$this->isValid()) {
+            return false;
+        }
+
+        // If approval system is disabled, auto-approve valid articles
+        if (!\App\Models\Setting::isPublishingApprovalsEnabled()) {
+            return true;
+        }
+
+        // If approval system is enabled, only approved articles can be published
+        return $this->isApproved();
+    }
+
     public function getIsPublishedAttribute(): bool
     {
         return $this->articlePublication()->exists();
@@ -70,14 +124,6 @@ public function articlePublication(): HasOne
         return $this->hasOne(ArticlePublication::class);
     }
 
-    /**
-     * @return HasMany<ArticlePublication, $this>
-     */
-    public function articlePublications(): HasMany
-    {
-        return $this->hasMany(ArticlePublication::class);
-    }
-
     /**
      * @return BelongsTo<Feed, $this>
      */
@@ -86,14 +132,6 @@ public function feed(): BelongsTo
         return $this->belongsTo(Feed::class);
     }
 
-    /**
-     * @return HasMany<RouteArticle, $this>
-     */
-    public function routeArticles(): HasMany
-    {
-        return $this->hasMany(RouteArticle::class);
-    }
-
     public function dispatchFetchedEvent(): void
     {
         event(new NewArticleFetched($this));

app/Models/ArticlePublication.php

@@ -6,19 +6,11 @@
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
-use Illuminate\Support\Carbon;
 
 /**
- * @property int $id
- * @property int $article_id
- * @property int $platform_channel_id
- * @property string $post_id
- * @property string $platform
- * @property string $published_by
- * @property array<string, mixed>|null $publication_data
- * @property Carbon $published_at
- * @property Carbon $created_at
- * @property Carbon $updated_at
+ * @property integer $article_id
+ * @property integer $platform_channel_id
+ * @property integer $post_id
  *
  * @method static create(array<string, mixed> $array)
  */

app/Models/Feed.php

@@ -3,7 +3,6 @@
 namespace App\Models;
 
 use Database\Factories\FeedFactory;
-use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
@@ -17,7 +16,7 @@
  * @property string $url
  * @property string $type
  * @property string $provider
- * @property int|null $language_id
+ * @property int $language_id
  * @property Language|null $language
  * @property string $description
  * @property array<string, mixed> $settings
@@ -25,7 +24,6 @@
  * @property Carbon|null $last_fetched_at
  * @property Carbon $created_at
  * @property Carbon $updated_at
- *
  * @method static orderBy(string $string, string $string1)
  * @method static where(string $string, true $true)
  * @method static findOrFail(mixed $feed_id)
@@ -34,9 +32,7 @@ class Feed extends Model
 {
     /** @use HasFactory<FeedFactory> */
     use HasFactory;
-
     private const RECENT_FETCH_THRESHOLD_HOURS = 2;
-
     private const DAILY_FETCH_THRESHOLD_HOURS = 24;
 
     protected $fillable = [
@@ -48,13 +44,13 @@ class Feed extends Model
         'description',
         'settings',
         'is_active',
-        'last_fetched_at',
+        'last_fetched_at'
     ];
 
     protected $casts = [
         'settings' => 'array',
         'is_active' => 'boolean',
-        'last_fetched_at' => 'datetime',
+        'last_fetched_at' => 'datetime'
     ];
 
     public function getTypeDisplayAttribute(): string
@@ -83,25 +79,12 @@ public function getStatusAttribute(): string
         } elseif ($hoursAgo < self::DAILY_FETCH_THRESHOLD_HOURS) {
             return "Fetched {$hoursAgo}h ago";
         } else {
-            return 'Fetched '.$this->last_fetched_at->diffForHumans();
+            return "Fetched " . $this->last_fetched_at->diffForHumans();
         }
     }
 
     /**
-     * @param  Builder<Feed>  $query
-     * @return Builder<Feed>
-     */
-    public function scopeStale(Builder $query, int $thresholdHours): Builder
-    {
-        return $query->where('is_active', true)
-            ->where(function (Builder $query) use ($thresholdHours) {
-                $query->whereNull('last_fetched_at')
-                    ->orWhere('last_fetched_at', '<', now()->subHours($thresholdHours));
-            });
-    }
-
-    /**
-     * @return BelongsToMany<PlatformChannel, $this>
+     * @return BelongsToMany<PlatformChannel, $this, Route>
      */
     public function channels(): BelongsToMany
     {
@@ -111,7 +94,7 @@ public function channels(): BelongsToMany
     }
 
     /**
-     * @return BelongsToMany<PlatformChannel, $this>
+     * @return BelongsToMany<PlatformChannel, $this, Route>
      */
     public function activeChannels(): BelongsToMany
     {

app/Models/Keyword.php

@@ -2,7 +2,6 @@
 
 namespace App\Models;
 
-use Database\Factories\KeywordFactory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
@@ -21,18 +20,17 @@
  */
 class Keyword extends Model
 {
-    /** @use HasFactory<KeywordFactory> */
     use HasFactory;
 
     protected $fillable = [
         'feed_id',
         'platform_channel_id',
         'keyword',
-        'is_active',
+        'is_active'
     ];
 
     protected $casts = [
-        'is_active' => 'boolean',
+        'is_active' => 'boolean'
     ];
 
     /**
@@ -50,4 +48,5 @@ public function platformChannel(): BelongsTo
     {
         return $this->belongsTo(PlatformChannel::class);
     }
+
 }

app/Models/Language.php

@@ -17,11 +17,11 @@ class Language extends Model
         'short_code',
         'name', 
         'native_name',
-        'is_active',
+        'is_active'
     ];
 
     protected $casts = [
-        'is_active' => 'boolean',
+        'is_active' => 'boolean'
     ];
 
     /**

app/Models/Log.php

@@ -3,14 +3,12 @@
 namespace App\Models;
 
 use App\Enums\LogLevelEnum;
-use Database\Factories\LogFactory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Carbon;
 
 /**
- * @method static create(array<string, mixed> $array)
- *
+ * @method static create(array $array)
  * @property LogLevelEnum $level
  * @property string $message
  * @property array<string, mixed> $context
@@ -19,7 +17,6 @@
  */
 class Log extends Model
 {
-    /** @use HasFactory<LogFactory> */
     use HasFactory;
 
     protected $table = 'logs';

app/Models/Notification.php

@@ -1,92 +0,0 @@
-<?php
-
-namespace App\Models;
-
-use App\Enums\NotificationSeverityEnum;
-use App\Enums\NotificationTypeEnum;
-use Database\Factories\NotificationFactory;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Relations\MorphTo;
-use Illuminate\Support\Carbon;
-
-/**
- * @property int $id
- * @property NotificationTypeEnum $type
- * @property NotificationSeverityEnum $severity
- * @property string $title
- * @property string $message
- * @property array<string, mixed>|null $data
- * @property string|null $notifiable_type
- * @property int|null $notifiable_id
- * @property Carbon|null $read_at
- * @property Carbon $created_at
- * @property Carbon $updated_at
- */
-class Notification extends Model
-{
-    /** @use HasFactory<NotificationFactory> */
-    use HasFactory;
-
-    protected $fillable = [
-        'type',
-        'severity',
-        'title',
-        'message',
-        'data',
-        'notifiable_type',
-        'notifiable_id',
-        'read_at',
-    ];
-
-    protected $casts = [
-        'type' => NotificationTypeEnum::class,
-        'severity' => NotificationSeverityEnum::class,
-        'data' => 'array',
-        'read_at' => 'datetime',
-        'created_at' => 'datetime',
-        'updated_at' => 'datetime',
-    ];
-
-    /**
-     * @return MorphTo<Model, $this>
-     */
-    public function notifiable(): MorphTo
-    {
-        return $this->morphTo();
-    }
-
-    public function isRead(): bool
-    {
-        return $this->read_at !== null;
-    }
-
-    public function markAsRead(): void
-    {
-        $this->update(['read_at' => now()]);
-    }
-
-    /**
-     * @param  Builder<Notification>  $query
-     * @return Builder<Notification>
-     */
-    public function scopeUnread(Builder $query): Builder
-    {
-        return $query->whereNull('read_at');
-    }
-
-    /**
-     * @param  Builder<Notification>  $query
-     * @return Builder<Notification>
-     */
-    public function scopeRecent(Builder $query): Builder
-    {
-        return $query->latest()->limit(50);
-    }
-
-    public static function markAllAsRead(): void
-    {
-        static::unread()->update(['read_at' => now()]);
-    }
-}

app/Models/PlatformAccount.php

@@ -2,15 +2,15 @@
 
 namespace App\Models;
 
-use App\Enums\PlatformEnum;
 use Database\Factories\PlatformAccountFactory;
-use Illuminate\Database\Eloquent\Casts\Attribute;
-use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Casts\Attribute;
+use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\Crypt;
+use App\Enums\PlatformEnum;
 
 /**
  * @property int $id
@@ -18,14 +18,13 @@
  * @property string $instance_url
  * @property string $username
  * @property string $password
- * @property array<string, mixed> $settings
+ * @property string $settings
  * @property bool $is_active
- * @property Carbon|null $last_tested_at
+ * @property Carbon $last_tested_at
  * @property string $status
  * @property Carbon $created_at
  * @property Carbon $updated_at
  * @property Collection<int, PlatformChannel> $activeChannels
- *
  * @method static where(string $string, PlatformEnum $platform)
  * @method static orderBy(string $string)
  * @method static create(array<string, mixed> $validated)
@@ -43,14 +42,14 @@ class PlatformAccount extends Model
         'settings',
         'is_active',
         'last_tested_at',
-        'status',
+        'status'
     ];
 
     protected $casts = [
         'platform' => PlatformEnum::class,
         'settings' => 'array',
         'is_active' => 'boolean',
-        'last_tested_at' => 'datetime',
+        'last_tested_at' => 'datetime'
     ];
 
     // Encrypt password when storing
@@ -94,6 +93,7 @@ protected function password(): Attribute
         )->withoutObjectCaching();
     }
 
+
     // Get the active accounts for a platform (returns collection)
     /**
      * @return Collection<int, PlatformAccount>

app/Models/PlatformChannel.php

@@ -10,16 +10,15 @@
 
 /**
  * @method static findMany(mixed $channel_ids)
- * @method static create(array<string, mixed> $array)
- *
- * @property int $id
- * @property int $platform_instance_id
+ * @method static create(array $array)
+ * @property integer $id
+ * @property integer $platform_instance_id
  * @property PlatformInstance $platformInstance
- * @property int $channel_id
+ * @property integer $channel_id
  * @property string $name
  * @property int $language_id
  * @property Language|null $language
- * @property bool $is_active
+ * @property boolean $is_active
  */
 class PlatformChannel extends Model
 {
@@ -35,11 +34,11 @@ class PlatformChannel extends Model
         'channel_id',
         'description',
         'language_id',
-        'is_active',
+        'is_active'
     ];
 
     protected $casts = [
-        'is_active' => 'boolean',
+        'is_active' => 'boolean'
     ];
 
     /**
@@ -75,7 +74,7 @@ public function getFullNameAttribute(): string
     }
 
     /**
-     * @return BelongsToMany<Feed, $this>
+     * @return BelongsToMany<Feed, $this, Route>
      */
     public function feeds(): BelongsToMany
     {
@@ -85,7 +84,7 @@ public function feeds(): BelongsToMany
     }
 
     /**
-     * @return BelongsToMany<Feed, $this>
+     * @return BelongsToMany<Feed, $this, Route>
      */
     public function activeFeeds(): BelongsToMany
     {

app/Models/PlatformChannelPost.php

@@ -3,7 +3,6 @@
 namespace App\Models;
 
 use App\Enums\PlatformEnum;
-use Illuminate\Database\Eloquent\Factories\Factory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
@@ -13,9 +12,7 @@
  */
 class PlatformChannelPost extends Model
 {
-    /** @use HasFactory<Factory<PlatformChannelPost>> */
     use HasFactory;
-
     protected $fillable = [
         'platform',
         'channel_id',

app/Models/PlatformInstance.php

@@ -12,12 +12,11 @@
 /**
  * @method static updateOrCreate(array<string, mixed> $array, $instanceData)
  * @method static where(string $string, mixed $operator)
- *
  * @property PlatformEnum $platform
  * @property string $url
  * @property string $name
  * @property string $description
- * @property bool $is_active
+ * @property boolean $is_active
  */
 class PlatformInstance extends Model
 {
@@ -29,12 +28,12 @@ class PlatformInstance extends Model
         'url',
         'name',
         'description',
-        'is_active',
+        'is_active'
     ];
 
     protected $casts = [
         'platform' => PlatformEnum::class,
-        'is_active' => 'boolean',
+        'is_active' => 'boolean'
     ];
 
     /**

app/Models/Route.php

@@ -4,9 +4,9 @@
 
 use Database\Factories\RouteFactory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Carbon;
 
 /**
@@ -14,7 +14,6 @@
  * @property int $platform_channel_id
  * @property bool $is_active
  * @property int $priority
- * @property bool|null $auto_approve
  * @property Carbon $created_at
  * @property Carbon $updated_at
  */
@@ -27,20 +26,17 @@ class Route extends Model
     
     // Laravel doesn't handle composite primary keys well, so we'll use regular queries
     protected $primaryKey = null;
-
     public $incrementing = false;
 
     protected $fillable = [
         'feed_id',
         'platform_channel_id',
         'is_active',
-        'priority',
-        'auto_approve',
+        'priority'
     ];
 
     protected $casts = [
-        'is_active' => 'boolean',
-        'auto_approve' => 'boolean',
+        'is_active' => 'boolean'
     ];
 
     /**
@@ -67,13 +63,4 @@ public function keywords(): HasMany
         return $this->hasMany(Keyword::class, 'feed_id', 'feed_id')
             ->where('platform_channel_id', $this->platform_channel_id);
     }
-
-    /**
-     * @return HasMany<RouteArticle, $this>
-     */
-    public function routeArticles(): HasMany
-    {
-        return $this->hasMany(RouteArticle::class, 'feed_id', 'feed_id')
-            ->where('platform_channel_id', $this->platform_channel_id);
-    }
 }

app/Models/RouteArticle.php

@@ -1,104 +0,0 @@
-<?php
-
-namespace App\Models;
-
-use App\Enums\ApprovalStatusEnum;
-use App\Enums\PublishStatusEnum;
-use App\Events\RouteArticleApproved;
-use Database\Factories\RouteArticleFactory;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Relations\BelongsTo;
-use Illuminate\Support\Carbon;
-
-/**
- * @property int $id
- * @property int $feed_id
- * @property int $platform_channel_id
- * @property int $article_id
- * @property ApprovalStatusEnum $approval_status
- * @property PublishStatusEnum $publish_status
- * @property Carbon|null $validated_at
- * @property Carbon $created_at
- * @property Carbon $updated_at
- */
-class RouteArticle extends Model
-{
-    /** @use HasFactory<RouteArticleFactory> */
-    use HasFactory;
-
-    protected $fillable = [
-        'feed_id',
-        'platform_channel_id',
-        'article_id',
-        'approval_status',
-        'publish_status',
-        'validated_at',
-    ];
-
-    protected $casts = [
-        'approval_status' => ApprovalStatusEnum::class,
-        'publish_status' => PublishStatusEnum::class,
-        'validated_at' => 'datetime',
-    ];
-
-    /**
-     * @return BelongsTo<Route, $this>
-     */
-    public function route(): BelongsTo
-    {
-        return $this->belongsTo(Route::class, 'feed_id', 'feed_id')
-            ->where('platform_channel_id', $this->platform_channel_id);
-    }
-
-    /**
-     * @return BelongsTo<Article, $this>
-     */
-    public function article(): BelongsTo
-    {
-        return $this->belongsTo(Article::class);
-    }
-
-    /**
-     * @return BelongsTo<Feed, $this>
-     */
-    public function feed(): BelongsTo
-    {
-        return $this->belongsTo(Feed::class);
-    }
-
-    /**
-     * @return BelongsTo<PlatformChannel, $this>
-     */
-    public function platformChannel(): BelongsTo
-    {
-        return $this->belongsTo(PlatformChannel::class);
-    }
-
-    public function isPending(): bool
-    {
-        return $this->approval_status === ApprovalStatusEnum::PENDING;
-    }
-
-    public function isApproved(): bool
-    {
-        return $this->approval_status === ApprovalStatusEnum::APPROVED;
-    }
-
-    public function isRejected(): bool
-    {
-        return $this->approval_status === ApprovalStatusEnum::REJECTED;
-    }
-
-    public function approve(): void
-    {
-        $this->update(['approval_status' => ApprovalStatusEnum::APPROVED]);
-
-        event(new RouteArticleApproved($this));
-    }
-
-    public function reject(): void
-    {
-        $this->update(['approval_status' => ApprovalStatusEnum::REJECTED]);
-    }
-}

app/Models/Setting.php

@@ -2,18 +2,16 @@
 
 namespace App\Models;
 
-use Database\Factories\SettingFactory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 /**
- * @method static updateOrCreate(array<string, string> $array, array<string, mixed> $array1)
- * @method static create(array<string, string> $array)
+ * @method static updateOrCreate(string[] $array, array $array1)
+ * @method static create(string[] $array)
  * @method static where(string $string, string $key)
  */
 class Setting extends Model
 {
-    /** @use HasFactory<SettingFactory> */
     use HasFactory;
 
     protected $fillable = ['key', 'value'];
@@ -71,14 +69,4 @@ public static function setArticlePublishingInterval(int $minutes): void
     {
         static::set('article_publishing_interval', (string) $minutes);
     }
-
-    public static function getFeedStalenessThreshold(): int
-    {
-        return (int) static::get('feed_staleness_threshold', 48);
-    }
-
-    public static function setFeedStalenessThreshold(int $hours): void
-    {
-        static::set('feed_staleness_threshold', (string) $hours);
-    }
 }

app/Models/User.php

@@ -3,7 +3,6 @@
 namespace App\Models;
 
 // use Illuminate\Contracts\Auth\MustVerifyEmail;
-use Database\Factories\UserFactory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
@@ -11,8 +10,8 @@
 
 class User extends Authenticatable
 {
-    /** @use HasFactory<UserFactory> */
-    use HasApiTokens, HasFactory, Notifiable;
+    /** @use HasFactory<\Database\Factories\UserFactory> */
+    use HasFactory, Notifiable, HasApiTokens;
 
     /**
      * The attributes that are mass assignable.

app/Modules/Lemmy/LemmyRequest.php

@@ -2,15 +2,13 @@
 
 namespace App\Modules\Lemmy;
 
-use Illuminate\Http\Client\Response;
 use Illuminate\Support\Facades\Http;
+use Illuminate\Http\Client\Response;
 
 class LemmyRequest
 {
     private string $instance;
-
     private ?string $token;
-
     private string $scheme = 'https';
 
     public function __construct(string $instance, ?string $token = null)
@@ -47,7 +45,6 @@ public function withScheme(string $scheme): self
         if (in_array($scheme, ['http', 'https'], true)) {
             $this->scheme = $scheme;
         }
-
         return $this;
     }
 
@@ -86,7 +83,6 @@ public function post(string $endpoint, array $data = []): Response
     public function withToken(string $token): self
     {
         $this->token = $token;
-
         return $this;
     }
 }

app/Modules/Lemmy/Services/LemmyApiService.php

@@ -61,7 +61,6 @@ public function login(string $username, string $password): ?string
                 }
 
                 $data = $response->json();
-
                 return $data['jwt'] ?? null;
             } catch (Exception $e) {
                 // Re-throw rate limit exceptions immediately
@@ -94,7 +93,6 @@ public function getCommunityId(string $communityName, string $token): int
             }
 
             $data = $response->json();
-
             return $data['community_view']['community']['id'] ?? throw new Exception('Community not found');
         } catch (Exception $e) {
             logger()->error('Community lookup failed', ['error' => $e->getMessage()]);
@@ -109,15 +107,14 @@ public function syncChannelPosts(string $token, int $platformChannelId, string $
             $response = $request->get('post/list', [
                 'community_id' => $platformChannelId,
                 'limit' => 50,
-                'sort' => 'New',
+                'sort' => 'New'
             ]);
 
             if (!$response->successful()) {
                 logger()->warning('Failed to sync channel posts', [
                     'status' => $response->status(),
-                    'platform_channel_id' => $platformChannelId,
+                    'platform_channel_id' => $platformChannelId
                 ]);
-
                 return;
             }
 
@@ -140,13 +137,13 @@ public function syncChannelPosts(string $token, int $platformChannelId, string $
 
             logger()->info('Synced channel posts', [
                 'platform_channel_id' => $platformChannelId,
-                'posts_count' => count($posts),
+                'posts_count' => count($posts)
             ]);
 
         } catch (Exception $e) {
             logger()->error('Exception while syncing channel posts', [
                 'error' => $e->getMessage(),
-                'platform_channel_id' => $platformChannelId,
+                'platform_channel_id' => $platformChannelId
             ]);
         }
     }
@@ -201,20 +198,17 @@ public function getLanguages(): array
 
             if (!$response->successful()) {
                 logger()->warning('Failed to fetch site languages', [
-                    'status' => $response->status(),
+                    'status' => $response->status()
                 ]);
-
                 return [];
             }
 
             $data = $response->json();
-
             return $data['all_languages'] ?? [];
         } catch (Exception $e) {
             logger()->error('Exception while fetching languages', [
-                'error' => $e->getMessage(),
+                'error' => $e->getMessage()
             ]);
-
             return [];
         }
     }

app/Modules/Lemmy/Services/LemmyPublisher.php

@@ -12,7 +12,6 @@
 class LemmyPublisher
 {
     private LemmyApiService $api;
-
     private PlatformAccount $account;
 
     public function __construct(PlatformAccount $account)
@@ -24,7 +23,6 @@ public function __construct(PlatformAccount $account)
     /**
      * @param array<string, mixed> $extractedData
      * @return array<string, mixed>
-     *
      * @throws PlatformAuthException
      * @throws Exception
      */
@@ -39,7 +37,6 @@ public function publishToChannel(Article $article, array $extractedData, Platfor
             // If the cached token was stale, refresh and retry once
             if (str_contains($e->getMessage(), 'not_logged_in') || str_contains($e->getMessage(), 'Unauthorized')) {
                 $token = $authService->refreshToken($this->account);
-
                 return $this->createPost($token, $extractedData, $channel, $article);
             }
             throw $e;
@@ -68,4 +65,5 @@ private function createPost(string $token, array $extractedData, PlatformChannel
             $languageId
         );
     }
+
 }

app/Providers/AppServiceProvider.php

@@ -3,14 +3,8 @@
 namespace App\Providers;
 
 use App\Enums\LogLevelEnum;
-use App\Events\ActionPerformed;
 use App\Events\ExceptionOccurred;
-use App\Events\NewArticleFetched;
-use App\Events\RouteArticleApproved;
-use App\Listeners\LogActionListener;
 use App\Listeners\LogExceptionToDatabase;
-use App\Listeners\PublishApprovedArticleListener;
-use App\Listeners\ValidateArticleListener;
 use Error;
 use Illuminate\Contracts\Debug\ExceptionHandler;
 use Illuminate\Support\Facades\Event;
@@ -20,28 +14,25 @@
 
 class AppServiceProvider extends ServiceProvider
 {
-    public function register(): void {}
+    public function register(): void
+    {
+    }
 
     public function boot(): void
     {
-        Event::listen(
-            ActionPerformed::class,
-            LogActionListener::class,
-        );
-
         Event::listen(
             ExceptionOccurred::class,
             LogExceptionToDatabase::class,
         );
 
         Event::listen(
-            NewArticleFetched::class,
-            ValidateArticleListener::class,
+            \App\Events\NewArticleFetched::class,
+            \App\Listeners\ValidateArticleListener::class,
         );
 
         Event::listen(
-            RouteArticleApproved::class,
-            PublishApprovedArticleListener::class,
+            \App\Events\ArticleApproved::class,
+            \App\Listeners\PublishApprovedArticleListener::class,
         );
 
         app()->make(ExceptionHandler::class)

app/Services/Article/ArticleFetcher.php

@@ -4,9 +4,9 @@
 
 use App\Models\Article;
 use App\Models\Feed;
+use App\Services\Http\HttpFetcher;
 use App\Services\Factories\ArticleParserFactory;
 use App\Services\Factories\HomepageParserFactory;
-use App\Services\Http\HttpFetcher;
 use App\Services\Log\LogSaver;
 use Exception;
 use Illuminate\Support\Collection;
@@ -28,9 +28,9 @@ public function getArticlesFromFeed(Feed $feed): Collection
             return $this->getArticlesFromWebsiteFeed($feed);
         }
 
-        $this->logSaver->warning('Unsupported feed type', null, [
+        $this->logSaver->warning("Unsupported feed type", null, [
             'feed_id' => $feed->id,
-            'feed_type' => $feed->type,
+            'feed_type' => $feed->type
         ]);
 
         return collect();
@@ -54,7 +54,7 @@ private function getArticlesFromRssFeed(Feed $feed): Collection
             }
 
             if ($rss === false || !isset($rss->channel->item)) {
-                $this->logSaver->warning('Failed to parse RSS feed XML', null, [
+                $this->logSaver->warning("Failed to parse RSS feed XML", null, [
                     'feed_id' => $feed->id,
                     'feed_url' => $feed->url,
                 ]);
@@ -72,7 +72,7 @@ private function getArticlesFromRssFeed(Feed $feed): Collection
 
             return $articles;
         } catch (Exception $e) {
-            $this->logSaver->error('Failed to fetch articles from RSS feed', null, [
+            $this->logSaver->error("Failed to fetch articles from RSS feed", null, [
                 'feed_id' => $feed->id,
                 'feed_url' => $feed->url,
                 'error' => $e->getMessage(),
@@ -92,9 +92,9 @@ private function getArticlesFromWebsiteFeed(Feed $feed): Collection
             $parser = HomepageParserFactory::getParserForFeed($feed);
 
             if (! $parser) {
-                $this->logSaver->warning('No parser available for feed URL', null, [
+                $this->logSaver->warning("No parser available for feed URL", null, [
                     'feed_id' => $feed->id,
-                    'feed_url' => $feed->url,
+                    'feed_url' => $feed->url
                 ]);
 
                 return collect();
@@ -107,10 +107,10 @@ private function getArticlesFromWebsiteFeed(Feed $feed): Collection
                 ->map(fn (string $url) => $this->saveArticle($url, $feed->id));
 
         } catch (Exception $e) {
-            $this->logSaver->error('Failed to fetch articles from website feed', null, [
+            $this->logSaver->error("Failed to fetch articles from website feed", null, [
                 'feed_id' => $feed->id,
                 'feed_url' => $feed->url,
-                'error' => $e->getMessage(),
+                'error' => $e->getMessage()
             ]);
 
             return collect();
@@ -130,7 +130,7 @@ public function fetchArticleData(Article $article): array
         } catch (Exception $e) {
             $this->logSaver->error('Exception while fetching article data', null, [
                 'url' => $article->url,
-                'error' => $e->getMessage(),
+                'error' => $e->getMessage()
             ]);
 
             return [];
@@ -155,8 +155,8 @@ private function saveArticle(string $url, ?int $feedId = null): Article
             }
 
             return $article;
-        } catch (Exception $e) {
-            $this->logSaver->error('Failed to create article', null, [
+        } catch (\Exception $e) {
+            $this->logSaver->error("Failed to create article", null, [
                 'url' => $url,
                 'feed_id' => $feedId,
                 'error' => $e->getMessage(),

app/Services/Article/ValidationService.php

@@ -2,13 +2,7 @@
 
 namespace App\Services\Article;
 
-use App\Enums\ApprovalStatusEnum;
 use App\Models\Article;
-use App\Models\Keyword;
-use App\Models\Route;
-use App\Models\RouteArticle;
-use App\Models\Setting;
-use Illuminate\Support\Collection;
 
 class ValidationService
 {
@@ -18,10 +12,11 @@ public function __construct(
 
     public function validate(Article $article): Article
     {
-        logger('Validating article for routes: '.$article->id);
+        logger('Checking keywords for article: ' . $article->id);
 
         $articleData = $this->articleFetcher->fetchArticleData($article);
 
+        // Update article with fetched metadata (title, description)
         $updateData = [];
 
         if (!empty($articleData)) {
@@ -33,84 +28,54 @@ public function validate(Article $article): Article
         if (!isset($articleData['full_article']) || empty($articleData['full_article'])) {
             logger()->warning('Article data missing full_article content', [
                 'article_id' => $article->id,
-                'url' => $article->url,
+                'url' => $article->url
             ]);
 
+            $updateData['approval_status'] = 'rejected';
+            $article->update($updateData);
+
+            return $article->refresh();
+        }
+
+        // Validate content against keywords. If validation fails, reject.
+        // If validation passes, leave approval_status as-is (pending) —
+        // the listener decides whether to auto-approve based on settings.
+        $validationResult = $this->validateByKeywords($articleData['full_article']);
+
+        if (! $validationResult) {
+            $updateData['approval_status'] = 'rejected';
+        }
+
         $updateData['validated_at'] = now();
         $article->update($updateData);
 
         return $article->refresh();
     }
 
-        $updateData['validated_at'] = now();
-        $article->update($updateData);
-
-        $this->createRouteArticles($article, $articleData['full_article']);
-
-        return $article->refresh();
-    }
-
-    private function createRouteArticles(Article $article, string $content): void
+    private function validateByKeywords(string $full_article): bool
     {
-        $activeRoutes = Route::where('feed_id', $article->feed_id)
-            ->where('is_active', true)
-            ->get();
+        // Belgian news content keywords - broader set for Belgian news relevance
+        $keywords = [
+            // Political parties and leaders
+            'N-VA', 'Bart De Wever', 'Frank Vandenbroucke', 'Alexander De Croo',
+            'Vooruit', 'Open Vld', 'CD&V', 'Vlaams Belang', 'PTB', 'PVDA',
 
-        // Batch-load all active keywords for this feed, grouped by channel
-        $keywordsByChannel = Keyword::where('feed_id', $article->feed_id)
-            ->where('is_active', true)
-            ->get()
-            ->groupBy('platform_channel_id');
+            // Belgian locations and institutions
+            'Belgium', 'Belgian', 'Flanders', 'Flemish', 'Wallonia', 'Brussels',
+            'Antwerp', 'Ghent', 'Bruges', 'Leuven', 'Mechelen', 'Namur', 'Liège', 'Charleroi',
+            'parliament', 'government', 'minister', 'policy', 'law', 'legislation',
 
-        // Match keywords against full article content, title, and description
-        $searchableContent = $content.' '.$article->title.' '.$article->description;
-
-        foreach ($activeRoutes as $route) {
-            $routeKeywords = $keywordsByChannel->get($route->platform_channel_id, collect());
-            $status = $this->evaluateKeywords($routeKeywords, $searchableContent);
-
-            if ($status === ApprovalStatusEnum::PENDING && $this->shouldAutoApprove($route)) {
-                $status = ApprovalStatusEnum::APPROVED;
-            }
-
-            RouteArticle::firstOrCreate(
-                [
-                    'feed_id' => $route->feed_id,
-                    'platform_channel_id' => $route->platform_channel_id,
-                    'article_id' => $article->id,
-                ],
-                [
-                    'approval_status' => $status,
-                    'validated_at' => now(),
-                ]
-            );
-        }
-    }
-
-    /**
-     * @param  Collection<int, Keyword>  $keywords
-     */
-    private function evaluateKeywords(Collection $keywords, string $content): ApprovalStatusEnum
-    {
-        if ($keywords->isEmpty()) {
-            return ApprovalStatusEnum::PENDING;
-        }
+            // Common Belgian news topics
+            'economy', 'economic', 'education', 'healthcare', 'transport', 'climate', 'energy',
+            'European', 'EU', 'migration', 'security', 'justice', 'culture', 'police'
+        ];
 
         foreach ($keywords as $keyword) {
-            if (stripos($content, $keyword->keyword) !== false) {
-                return ApprovalStatusEnum::PENDING;
+            if (stripos($full_article, $keyword) !== false) {
+                return true;
             }
         }
 
-        return ApprovalStatusEnum::REJECTED;
-    }
-
-    private function shouldAutoApprove(Route $route): bool
-    {
-        if ($route->auto_approve !== null) {
-            return $route->auto_approve;
-        }
-
-        return ! Setting::isPublishingApprovalsEnabled();
+        return false;
     }
 }

app/Services/Auth/LemmyAuthService.php

@@ -52,12 +52,8 @@ public function refreshToken(PlatformAccount $account): string
 
     /**
      * Authenticate with Lemmy API and return user data with JWT
-     *
      * @throws PlatformAuthException
      */
-    /**
-     * @return array<string, mixed>
-     */
     public function authenticate(string $instanceUrl, string $username, string $password): array
     {
         try {
@@ -79,8 +75,8 @@ public function authenticate(string $instanceUrl, string $username, string $pass
                         'id' => 0, // Would need API call to get actual user info
                         'display_name' => null,
                         'bio' => null,
-                    ],
-                ],
+                    ]
+                ]
             ];
         } catch (PlatformAuthException $e) {
             // Re-throw PlatformAuthExceptions as-is to avoid nesting

app/Services/DashboardStatsService.php

@@ -9,12 +9,10 @@
 use App\Models\PlatformChannel;
 use App\Models\Route;
 use Carbon\Carbon;
+use Illuminate\Support\Facades\DB;
 
 class DashboardStatsService
 {
-    /**
-     * @return array<string, mixed>
-     */
     public function getStats(string $period = 'today'): array
     {
         $dateRange = $this->getDateRange($period);
@@ -75,9 +73,6 @@ private function getDateRange(string $period): ?array
         };
     }
 
-    /**
-     * @return array<string, int>
-     */
     public function getSystemStats(): array
     {
         $totalFeeds = Feed::query()->count();

app/Services/Factories/ArticleParserFactory.php

@@ -4,9 +4,9 @@
 
 use App\Contracts\ArticleParserInterface;
 use App\Models\Feed;
+use App\Services\Parsers\VrtArticleParser;
 use App\Services\Parsers\BelgaArticleParser;
 use App\Services\Parsers\GuardianArticleParser;
-use App\Services\Parsers\VrtArticleParser;
 use Exception;
 
 class ArticleParserFactory
@@ -26,7 +26,7 @@ class ArticleParserFactory
     public static function getParser(string $url): ArticleParserInterface
     {
         foreach (self::$parsers as $parserClass) {
-            $parser = new $parserClass;
+            $parser = new $parserClass();
 
             if ($parser->canParse($url)) {
                 return $parser;
@@ -47,13 +47,12 @@ public static function getParserForFeed(Feed $feed, string $parserType = 'articl
             return null;
         }
 
-        /** @var class-string<ArticleParserInterface> $parserClass */
         $parserClass = $providerConfig['parsers'][$parserType];
         if (!class_exists($parserClass)) {
             return null;
         }
 
-        return new $parserClass;
+        return new $parserClass();
     }
 
     /**
@@ -62,8 +61,7 @@ public static function getParserForFeed(Feed $feed, string $parserType = 'articl
     public static function getSupportedSources(): array
     {
         return array_map(function($parserClass) {
-            $parser = new $parserClass;
-
+            $parser = new $parserClass();
             return $parser->getSourceName();
         }, self::$parsers);
     }

app/Services/Factories/HomepageParserFactory.php

@@ -18,13 +18,12 @@ public static function getParserForFeed(Feed $feed): ?HomepageParserInterface
             return null;
         }
 
-        /** @var class-string<HomepageParserInterface> $parserClass */
         $parserClass = $providerConfig['parsers']['homepage'];
         if (!class_exists($parserClass)) {
             return null;
         }
 
-        $language = $feed->language->short_code ?? 'en';
+        $language = $feed->language?->short_code ?? 'en';
 
         return new $parserClass($language);
     }

app/Services/Http/HttpFetcher.php

@@ -2,9 +2,8 @@
 
 namespace App\Services\Http;
 
-use Exception;
-use Illuminate\Http\Client\Response;
 use Illuminate\Support\Facades\Http;
+use Exception;
 
 class HttpFetcher
 {
@@ -24,7 +23,7 @@ public static function fetchHtml(string $url): string
         } catch (Exception $e) {
             logger()->error('HTTP fetch failed', [
                 'url' => $url,
-                'error' => $e->getMessage(),
+                'error' => $e->getMessage()
             ]);
 
             throw $e;
@@ -49,20 +48,20 @@ public static function fetchMultipleUrls(array $urls): array
                 ->reject(fn($response, $index) => $response instanceof Exception)
                 ->map(function ($response, $index) use ($urls) {
                     $url = $urls[$index];
-                    /** @var Response $response */
+
                     try {
                         if ($response->successful()) {
                             return [
                                 'url' => $url,
                                 'html' => $response->body(),
-                                'success' => true,
+                                'success' => true
                             ];
                         } else {
                             return [
                                 'url' => $url,
                                 'html' => null,
                                 'success' => false,
-                                'status' => $response->status(),
+                                'status' => $response->status()
                             ];
                         }
                     } catch (Exception) {
@@ -70,10 +69,11 @@ public static function fetchMultipleUrls(array $urls): array
                             'url' => $url,
                             'html' => null,
                             'success' => false,
-                            'error' => 'Exception occurred',
+                            'error' => 'Exception occurred'
                         ];
                     }
                 })
+                ->filter(fn($result) => $result !== null)
                 ->toArray();
         } catch (Exception $e) {
             logger()->error('Multiple URL fetch failed', ['error' => $e->getMessage()]);

app/Services/Log/LogSaver.php

@@ -43,7 +43,7 @@ public function debug(string $message, ?PlatformChannel $channel = null, array $
     /**
      * @param array<string, mixed> $context
      */
-    public function log(LogLevelEnum $level, string $message, ?PlatformChannel $channel = null, array $context = []): void
+    private function log(LogLevelEnum $level, string $message, ?PlatformChannel $channel = null, array $context = []): void
     {
         $logContext = $context;
 

app/Services/Notification/NotificationService.php

@@ -1,69 +0,0 @@
-<?php
-
-namespace App\Services\Notification;
-
-use App\Enums\NotificationSeverityEnum;
-use App\Enums\NotificationTypeEnum;
-use App\Models\Notification;
-use Illuminate\Database\Eloquent\Model;
-
-class NotificationService
-{
-    /**
-     * @param  array<string, mixed>  $data
-     */
-    public function send(
-        NotificationTypeEnum $type,
-        NotificationSeverityEnum $severity,
-        string $title,
-        string $message,
-        ?Model $notifiable = null,
-        array $data = [],
-    ): Notification {
-        return Notification::create([
-            'type' => $type,
-            'severity' => $severity,
-            'title' => $title,
-            'message' => $message,
-            'data' => $data ?: null,
-            'notifiable_type' => $notifiable?->getMorphClass(),
-            'notifiable_id' => $notifiable?->getKey(),
-        ]);
-    }
-
-    /**
-     * @param  array<string, mixed>  $data
-     */
-    public function info(
-        string $title,
-        string $message,
-        ?Model $notifiable = null,
-        array $data = [],
-    ): Notification {
-        return $this->send(NotificationTypeEnum::GENERAL, NotificationSeverityEnum::INFO, $title, $message, $notifiable, $data);
-    }
-
-    /**
-     * @param  array<string, mixed>  $data
-     */
-    public function warning(
-        string $title,
-        string $message,
-        ?Model $notifiable = null,
-        array $data = [],
-    ): Notification {
-        return $this->send(NotificationTypeEnum::GENERAL, NotificationSeverityEnum::WARNING, $title, $message, $notifiable, $data);
-    }
-
-    /**
-     * @param  array<string, mixed>  $data
-     */
-    public function error(
-        string $title,
-        string $message,
-        ?Model $notifiable = null,
-        array $data = [],
-    ): Notification {
-        return $this->send(NotificationTypeEnum::GENERAL, NotificationSeverityEnum::ERROR, $title, $message, $notifiable, $data);
-    }
-}

app/Services/Parsers/BelgaHomepageParser.php

@@ -0,0 +1,48 @@
+<?php
+
+namespace App\Services\Parsers;
+
+class BelgaHomepageParser
+{
+    /**
+     * @return array<int, string>
+     */
+    public static function extractArticleUrls(string $html): array
+    {
+        // Find all relative article links (most articles use relative paths)
+        preg_match_all('/<a[^>]+href="(\/[a-z0-9-]+)"/', $html, $matches);
+
+        // Blacklist of non-article paths
+        $blacklistPaths = [
+            '/',
+            '/de',
+            '/feed',
+            '/search',
+            '/category',
+            '/about',
+            '/contact',
+            '/privacy',
+            '/terms',
+        ];
+
+        $urls = collect($matches[1])
+            ->unique()
+            ->filter(function ($path) use ($blacklistPaths) {
+                // Exclude exact matches and paths starting with blacklisted paths
+                foreach ($blacklistPaths as $blacklistedPath) {
+                    if ($path === $blacklistedPath || str_starts_with($path, $blacklistedPath . '/')) {
+                        return false;
+                    }
+                }
+                return true;
+            })
+            ->map(function ($path) {
+                // Convert relative paths to absolute URLs
+                return 'https://www.belganewsagency.eu' . $path;
+            })
+            ->values()
+            ->toArray();
+
+        return $urls;
+    }
+}

app/Services/Parsers/BelgaHomepageParserAdapter.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Services\Parsers;
+
+use App\Contracts\HomepageParserInterface;
+
+class BelgaHomepageParserAdapter implements HomepageParserInterface
+{
+    public function __construct(
+        private string $language = 'en',
+    ) {}
+
+    public function canParse(string $url): bool
+    {
+        return str_contains($url, 'belganewsagency.eu');
+    }
+
+    public function extractArticleUrls(string $html): array
+    {
+        return BelgaHomepageParser::extractArticleUrls($html);
+    }
+
+    public function getHomepageUrl(): string
+    {
+        return 'https://www.belganewsagency.eu/';
+    }
+
+    public function getSourceName(): string
+    {
+        return 'Belga News Agency';
+    }
+}

app/Services/Publishing/ArticlePublishingService.php

@@ -8,16 +8,19 @@
 use App\Models\ArticlePublication;
 use App\Models\PlatformChannel;
 use App\Models\PlatformChannelPost;
-use App\Models\RouteArticle;
+use App\Models\Route;
 use App\Modules\Lemmy\Services\LemmyPublisher;
 use App\Services\Log\LogSaver;
 use Exception;
+use Illuminate\Database\Eloquent\Collection as EloquentCollection;
+use Illuminate\Support\Collection;
 use RuntimeException;
 
 class ArticlePublishingService
 {
-    public function __construct(private LogSaver $logSaver) {}
-
+    public function __construct(private LogSaver $logSaver)
+    {
+    }
     /**
      * Factory seam to create publisher instances (helps testing without network calls)
      */
@@ -25,39 +28,84 @@ protected function makePublisher(mixed $account): LemmyPublisher
     {
         return new LemmyPublisher($account);
     }
-
     /**
-     * Publish an article to the channel specified by a route_article record.
-     *
      * @param array<string, mixed> $extractedData
-     *
+     * @return Collection<int, ArticlePublication>
      * @throws PublishException
      */
-    public function publishRouteArticle(RouteArticle $routeArticle, array $extractedData): ?ArticlePublication
+    public function publishToRoutedChannels(Article $article, array $extractedData): Collection
     {
-        $article = $routeArticle->article;
-        $channel = $routeArticle->platformChannel;
-
-        if (! $channel) {
-            throw new PublishException($article, PlatformEnum::LEMMY, new RuntimeException('ROUTE_ARTICLE_MISSING_CHANNEL'));
+        if (! $article->isValid()) {
+            throw new PublishException($article, PlatformEnum::LEMMY, new RuntimeException('CANNOT_PUBLISH_INVALID_ARTICLE'));
         }
 
-        if (! $channel->relationLoaded('platformInstance')) {
-            $channel->load(['platformInstance', 'activePlatformAccounts']);
-        }
+        $feed = $article->feed;
 
+        // Get active routes with keywords instead of just channels
+        $activeRoutes = Route::where('feed_id', $feed->id)
+            ->where('is_active', true)
+            ->with(['platformChannel.platformInstance', 'platformChannel.activePlatformAccounts', 'keywords'])
+            ->orderBy('priority', 'desc')
+            ->get();
+
+        // Filter routes based on keyword matches
+        $matchingRoutes = $activeRoutes->filter(function (Route $route) use ($extractedData) {
+            return $this->routeMatchesArticle($route, $extractedData);
+        });
+
+        return $matchingRoutes->map(function (Route $route) use ($article, $extractedData) {
+            $channel = $route->platformChannel;
             $account = $channel->activePlatformAccounts()->first();
 
             if (! $account) {
                 $this->logSaver->warning('No active account for channel', $channel, [
                     'article_id' => $article->id,
-                'route_article_id' => $routeArticle->id,
+                    'route_priority' => $route->priority
                 ]);
 
                 return null;
             }
 
             return $this->publishToChannel($article, $extractedData, $channel, $account);
+        })
+        ->filter();
+    }
+
+    /**
+     * Check if a route matches an article based on keywords
+     * @param array<string, mixed> $extractedData
+     */
+    private function routeMatchesArticle(Route $route, array $extractedData): bool
+    {
+        // Get active keywords for this route
+        $activeKeywords = $route->keywords->where('is_active', true);
+
+        // If no keywords are defined for this route, the route matches any article
+        if ($activeKeywords->isEmpty()) {
+            return true;
+        }
+
+        // Get article content for keyword matching
+        $articleContent = '';
+        if (isset($extractedData['full_article'])) {
+            $articleContent = $extractedData['full_article'];
+        }
+        if (isset($extractedData['title'])) {
+            $articleContent .= ' ' . $extractedData['title'];
+        }
+        if (isset($extractedData['description'])) {
+            $articleContent .= ' ' . $extractedData['description'];
+        }
+
+        // Check if any of the route's keywords match the article content
+        foreach ($activeKeywords as $keywordModel) {
+            $keyword = $keywordModel->keyword;
+            if (stripos($articleContent, $keyword) !== false) {
+                return true;
+            }
+        }
+
+        return false;
     }
 
     /**
@@ -96,15 +144,15 @@ private function publishToChannel(Article $article, array $extractedData, Platfo
                 'publication_data' => $postData,
             ]);
 
-            $this->logSaver->info('Published to channel', $channel, [
-                'article_id' => $article->id,
+            $this->logSaver->info('Published to channel via keyword-filtered routing', $channel, [
+                'article_id' => $article->id
             ]);
 
             return $publication;
         } catch (Exception $e) {
             $this->logSaver->warning('Failed to publish to channel', $channel, [
                 'article_id' => $article->id,
-                'error' => $e->getMessage(),
+                'error' => $e->getMessage()
             ]);
 
             return null;

app/Services/RoutingValidationService.php

@@ -11,7 +11,6 @@ class RoutingValidationService
 {
     /**
      * @param Collection<int, PlatformChannel> $channels
-     *
      * @throws RoutingMismatchException
      */
     public function validateLanguageCompatibility(Feed $feed, Collection $channels): void

app/Services/SystemStatusService.php

@@ -3,8 +3,8 @@
 namespace App\Services;
 
 use App\Models\Feed;
-use App\Models\PlatformChannel;
 use App\Models\Route;
+use App\Models\PlatformChannel;
 use App\Models\Setting;
 
 class SystemStatusService

bootstrap/app.php

@@ -1,7 +1,5 @@
 <?php
 
-use App\Enums\LogLevelEnum;
-use App\Events\ExceptionOccurred;
 use App\Http\Middleware\EnsureOnboardingComplete;
 use App\Http\Middleware\RedirectIfOnboardingComplete;
 use Illuminate\Foundation\Application;
@@ -24,13 +22,13 @@
     ->withExceptions(function (Exceptions $exceptions) {
         $exceptions->reportable(function (Throwable $e) {
             $level = match (true) {
-                $e instanceof Error => LogLevelEnum::CRITICAL,
-                $e instanceof RuntimeException => LogLevelEnum::ERROR,
-                $e instanceof InvalidArgumentException => LogLevelEnum::WARNING,
-                default => LogLevelEnum::ERROR,
+                $e instanceof Error => \App\Enums\LogLevelEnum::CRITICAL,
+                $e instanceof RuntimeException => \App\Enums\LogLevelEnum::ERROR,
+                $e instanceof InvalidArgumentException => \App\Enums\LogLevelEnum::WARNING,
+                default => \App\Enums\LogLevelEnum::ERROR,
             };
 
-            ExceptionOccurred::dispatch(
+            App\Events\ExceptionOccurred::dispatch(
                 $e,
                 $level,
                 $e->getMessage(),

bootstrap/providers.php

@@ -1,9 +1,6 @@
 <?php
 
-use App\Providers\AppServiceProvider;
-use App\Providers\HorizonServiceProvider;
-
 return [
-    AppServiceProvider::class,
-    HorizonServiceProvider::class,
+    App\Providers\AppServiceProvider::class,
+    App\Providers\HorizonServiceProvider::class,
 ];

composer.json

@@ -29,7 +29,6 @@
         "mockery/mockery": "^1.6",
         "nunomaduro/collision": "^8.6",
         "phpstan/phpstan": "^2.1",
-        "phpstan/phpstan-mockery": "^2.0",
         "phpunit/phpunit": "^11.5.3"
     },
     "autoload": {

config/auth.php

@@ -1,7 +1,5 @@
 <?php
 
-use App\Models\User;
-
 return [
 
     /*
@@ -64,7 +62,7 @@
     'providers' => [
         'users' => [
             'driver' => 'eloquent',
-            'model' => env('AUTH_MODEL', User::class),
+            'model' => env('AUTH_MODEL', App\Models\User::class),
         ],
 
         // 'users' => [

config/feed.php

@@ -1,13 +1,5 @@
 <?php
 
-use App\Services\Parsers\BelgaArticlePageParser;
-use App\Services\Parsers\BelgaArticleParser;
-use App\Services\Parsers\GuardianArticlePageParser;
-use App\Services\Parsers\GuardianArticleParser;
-use App\Services\Parsers\VrtArticlePageParser;
-use App\Services\Parsers\VrtArticleParser;
-use App\Services\Parsers\VrtHomepageParserAdapter;
-
 return [
     /*
     |--------------------------------------------------------------------------
@@ -32,23 +24,24 @@
                 'nl' => ['url' => 'https://www.vrt.be/vrtnws/nl/'],
             ],
             'parsers' => [
-                'homepage' => VrtHomepageParserAdapter::class,
-                'article' => VrtArticleParser::class,
-                'article_page' => VrtArticlePageParser::class,
+                'homepage' => \App\Services\Parsers\VrtHomepageParserAdapter::class,
+                'article' => \App\Services\Parsers\VrtArticleParser::class,
+                'article_page' => \App\Services\Parsers\VrtArticlePageParser::class,
             ],
         ],
         'belga' => [
             'code' => 'belga',
             'name' => 'Belga News Agency',
             'description' => 'Belgian national news agency',
-            'type' => 'rss',
+            'type' => 'website',
             'is_active' => true,
             'languages' => [
-                'en' => ['url' => 'https://www.belganewsagency.eu/feed'],
+                'en' => ['url' => 'https://www.belganewsagency.eu/'],
             ],
             'parsers' => [
-                'article' => BelgaArticleParser::class,
-                'article_page' => BelgaArticlePageParser::class,
+                'homepage' => \App\Services\Parsers\BelgaHomepageParserAdapter::class,
+                'article' => \App\Services\Parsers\BelgaArticleParser::class,
+                'article_page' => \App\Services\Parsers\BelgaArticlePageParser::class,
             ],
         ],
         'guardian' => [
@@ -61,8 +54,8 @@
                 'en' => ['url' => 'https://www.theguardian.com/international/rss'],
             ],
             'parsers' => [
-                'article' => GuardianArticleParser::class,
-                'article_page' => GuardianArticlePageParser::class,
+                'article' => \App\Services\Parsers\GuardianArticleParser::class,
+                'article_page' => \App\Services\Parsers\GuardianArticlePageParser::class,
             ],
         ],
     ],

config/sanctum.php

@@ -1,8 +1,5 @@
 <?php
 
-use Illuminate\Cookie\Middleware\EncryptCookies;
-use Illuminate\Foundation\Http\Middleware\ValidateCsrfToken;
-use Laravel\Sanctum\Http\Middleware\AuthenticateSession;
 use Laravel\Sanctum\Sanctum;
 
 return [
@@ -79,9 +76,9 @@
     */
 
     'middleware' => [
-        'authenticate_session' => AuthenticateSession::class,
-        'encrypt_cookies' => EncryptCookies::class,
-        'validate_csrf_token' => ValidateCsrfToken::class,
+        'authenticate_session' => Laravel\Sanctum\Http\Middleware\AuthenticateSession::class,
+        'encrypt_cookies' => Illuminate\Cookie\Middleware\EncryptCookies::class,
+        'validate_csrf_token' => Illuminate\Foundation\Http\Middleware\ValidateCsrfToken::class,
     ],
 
 ];

database/factories/ArticleFactory.php

@@ -2,12 +2,10 @@
 
 namespace Database\Factories;
 
-use App\Models\Article;
-use App\Models\Feed;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 /**
- * @extends Factory<Article>
+ * @extends \Illuminate\Database\Eloquent\Factories\Factory<\App\Models\Article>
  */
 class ArticleFactory extends Factory
 {
@@ -19,14 +17,16 @@ class ArticleFactory extends Factory
     public function definition(): array
     {
         return [
-            'feed_id' => Feed::factory(),
-            'url' => $this->faker->unique()->url(),
+            'feed_id' => \App\Models\Feed::factory(),
+            'url' => $this->faker->url(),
             'title' => $this->faker->sentence(),
             'description' => $this->faker->paragraph(),
             'content' => $this->faker->paragraphs(3, true),
             'image_url' => $this->faker->optional()->imageUrl(),
             'published_at' => $this->faker->optional()->dateTimeBetween('-1 month', 'now'),
             'author' => $this->faker->optional()->name(),
+            'approval_status' => $this->faker->randomElement(['pending', 'approved', 'rejected']),
+            'publish_status' => 'unpublished',
         ];
     }
 }

database/factories/ArticlePublicationFactory.php

@@ -2,8 +2,8 @@
 
 namespace Database\Factories;
 
-use App\Models\Article;
 use App\Models\ArticlePublication;
+use App\Models\Article;
 use App\Models\PlatformChannel;
 use Illuminate\Database\Eloquent\Factories\Factory;