Merge branch 'v3' of https://github.com/NativePHP/nativephp.com into v3

Author: shanerbaner82

app/Console/Commands/GeneratePluginLicenseKeys.php

@@ -0,0 +1,65 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\User;
+use Illuminate\Console\Command;
+
+class GeneratePluginLicenseKeys extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'plugins:generate-license-keys
+                            {--force : Regenerate keys for all users, even those who already have one}';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Generate plugin license keys for all users who do not have one';
+
+    /**
+     * Execute the console command.
+     */
+    public function handle(): int
+    {
+        $force = $this->option('force');
+
+        $query = User::query();
+
+        if (! $force) {
+            $query->whereNull('plugin_license_key');
+        }
+
+        $count = $query->count();
+
+        if ($count === 0) {
+            $this->info('All users already have plugin license keys.');
+
+            return self::SUCCESS;
+        }
+
+        $this->info("Generating plugin license keys for {$count} users...");
+
+        $bar = $this->output->createProgressBar($count);
+        $bar->start();
+
+        $query->chunkById(100, function ($users) use ($bar) {
+            foreach ($users as $user) {
+                $user->getPluginLicenseKey();
+                $bar->advance();
+            }
+        });
+
+        $bar->finish();
+        $this->newLine();
+
+        $this->info("Generated plugin license keys for {$count} users.");
+
+        return self::SUCCESS;
+    }
+}

app/Console/Commands/RetryFailedPayouts.php

@@ -0,0 +1,89 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Enums\PayoutStatus;
+use App\Models\PluginPayout;
+use App\Services\StripeConnectService;
+use Illuminate\Console\Command;
+
+class RetryFailedPayouts extends Command
+{
+    protected $signature = 'payouts:retry-failed {--payout-id= : Retry a specific payout}';
+
+    protected $description = 'Retry failed plugin payouts';
+
+    public function handle(StripeConnectService $stripeConnectService): int
+    {
+        $payoutId = $this->option('payout-id');
+
+        if ($payoutId) {
+            $payout = PluginPayout::find($payoutId);
+
+            if (! $payout) {
+                $this->error("Payout #{$payoutId} not found.");
+
+                return self::FAILURE;
+            }
+
+            if (! $payout->isFailed()) {
+                $this->error("Payout #{$payoutId} is not in failed status.");
+
+                return self::FAILURE;
+            }
+
+            return $this->retryPayout($payout, $stripeConnectService);
+        }
+
+        $failedPayouts = PluginPayout::failed()
+            ->with(['pluginLicense', 'developerAccount'])
+            ->get();
+
+        if ($failedPayouts->isEmpty()) {
+            $this->info('No failed payouts to retry.');
+
+            return self::SUCCESS;
+        }
+
+        $this->info("Found {$failedPayouts->count()} failed payout(s) to retry.");
+
+        $succeeded = 0;
+        $failed = 0;
+
+        foreach ($failedPayouts as $payout) {
+            // Reset status to pending before retrying
+            $payout->update(['status' => PayoutStatus::Pending]);
+
+            if ($stripeConnectService->processTransfer($payout)) {
+                $this->info("Payout #{$payout->id} succeeded.");
+                $succeeded++;
+            } else {
+                $this->error("Payout #{$payout->id} failed again.");
+                $failed++;
+            }
+        }
+
+        $this->newLine();
+        $this->info("Results: {$succeeded} succeeded, {$failed} failed.");
+
+        return $failed > 0 ? self::FAILURE : self::SUCCESS;
+    }
+
+    protected function retryPayout(PluginPayout $payout, StripeConnectService $stripeConnectService): int
+    {
+        $this->info("Retrying payout #{$payout->id}...");
+
+        // Reset status to pending before retrying
+        $payout->update(['status' => PayoutStatus::Pending]);
+
+        if ($stripeConnectService->processTransfer($payout)) {
+            $this->info('Payout succeeded!');
+
+            return self::SUCCESS;
+        }
+
+        $this->error('Payout failed again.');
+
+        return self::FAILURE;
+    }
+}

app/Console/Commands/SatisBuild.php

@@ -0,0 +1,76 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Services\SatisService;
+use Illuminate\Console\Command;
+
+class SatisBuild extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'satis:build
+                            {--plugin= : Build only a specific plugin by name (e.g., vendor/package)}';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Trigger a Satis repository build';
+
+    /**
+     * Execute the console command.
+     */
+    public function handle(SatisService $satisService): int
+    {
+        $pluginName = $this->option('plugin');
+
+        if ($pluginName) {
+            $plugin = \App\Models\Plugin::where('name', $pluginName)->first();
+
+            if (! $plugin) {
+                $this->error("Plugin '{$pluginName}' not found.");
+
+                return self::FAILURE;
+            }
+
+            if (! $plugin->isApproved()) {
+                $this->error("Plugin '{$pluginName}' is not approved.");
+
+                return self::FAILURE;
+            }
+
+            $this->info("Triggering Satis build for: {$pluginName}");
+            $result = $satisService->build([$plugin]);
+        } else {
+            $this->info('Triggering Satis build for all approved plugins...');
+            $result = $satisService->buildAll();
+        }
+
+        if ($result['success']) {
+            $this->info('Build triggered successfully!');
+            $this->line("Job ID: {$result['job_id']}");
+
+            if (isset($result['plugins_count'])) {
+                $this->line("Plugins: {$result['plugins_count']}");
+            }
+
+            return self::SUCCESS;
+        }
+
+        $this->error('Build trigger failed: '.$result['error']);
+
+        if (isset($result['status'])) {
+            $this->line("HTTP Status: {$result['status']}");
+        }
+
+        $this->line('API URL: '.config('services.satis.url'));
+        $this->line('API Key configured: '.(config('services.satis.api_key') ? 'Yes' : 'No'));
+
+        return self::FAILURE;
+    }
+}

app/Console/Commands/SendLicenseExpiryWarnings.php

@@ -8,17 +8,22 @@
 
 class SendLicenseExpiryWarnings extends Command
 {
-    protected $signature = 'licenses:send-expiry-warnings';
+    protected $signature = 'licenses:send-expiry-warnings {--catch-up : Send missed warnings for licenses within warning windows}';
 
     protected $description = 'Send expiry warning emails for licenses that are expiring soon';
 
     public function handle(): int
     {
         $warningDays = [30, 7, 1];
         $totalSent = 0;
+        $catchUp = $this->option('catch-up');
+
+        if ($catchUp) {
+            $this->info('Running in catch-up mode - sending missed warnings...');
+        }
 
         foreach ($warningDays as $days) {
-            $sent = $this->sendWarningsForDays($days);
+            $sent = $this->sendWarningsForDays($days, $catchUp);
             $totalSent += $sent;
 
             $this->info("Sent {$sent} warning emails for licenses expiring in {$days} day(s)");
@@ -29,24 +34,38 @@ public function handle(): int
         return Command::SUCCESS;
     }
 
-    private function sendWarningsForDays(int $days): int
+    private function sendWarningsForDays(int $days, bool $catchUp = false): int
     {
-        $targetDate = now()->addDays($days)->startOfDay();
         $sent = 0;
 
-        // Find licenses that:
-        // 1. Expire on the target date
-        // 2. Don't have an active subscription (legacy licenses)
-        // 3. Haven't been sent a warning for this specific day count recently
-        $licenses = License::query()
-            ->whereDate('expires_at', $targetDate)
+        $query = License::query()
             ->whereNull('subscription_item_id') // Legacy licenses without subscriptions
-            ->whereDoesntHave('expiryWarnings', function ($query) use ($days) {
-                $query->where('warning_days', $days)
-                    ->where('sent_at', '>=', now()->subHours(23)); // Prevent duplicate emails within 23 hours
-            })
-            ->with('user')
-            ->get();
+            ->with('user');
+
+        if ($catchUp) {
+            // Catch-up mode: find licenses that are within the warning window but haven't received this warning yet
+            // For 30-day: expires within 30 days (but more than 7 days to avoid overlap)
+            // For 7-day: expires within 7 days (but more than 1 day)
+            // For 1-day: expires within 1 day (but hasn't expired yet)
+            $warningThresholds = [30 => 7, 7 => 1, 1 => 0];
+            $lowerBound = $warningThresholds[$days] ?? 0;
+
+            $query->where('expires_at', '>', now()->addDays($lowerBound)->startOfDay())
+                ->where('expires_at', '<=', now()->addDays($days)->endOfDay())
+                ->whereDoesntHave('expiryWarnings', function ($q) use ($days) {
+                    $q->where('warning_days', $days);
+                });
+        } else {
+            // Normal mode: only licenses expiring on the exact target date
+            $targetDate = now()->addDays($days)->startOfDay();
+            $query->whereDate('expires_at', $targetDate)
+                ->whereDoesntHave('expiryWarnings', function ($q) use ($days) {
+                    $q->where('warning_days', $days)
+                        ->where('sent_at', '>=', now()->subHours(23)); // Prevent duplicate emails within 23 hours
+                });
+        }
+
+        $licenses = $query->get();
 
         foreach ($licenses as $license) {
             if ($license->user) {

app/Console/Commands/SyncPlugins.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Jobs\SyncPlugin;
+use App\Models\Plugin;
+use Illuminate\Console\Command;
+
+class SyncPlugins extends Command
+{
+    protected $signature = 'plugins:sync';
+
+    protected $description = 'Dispatch jobs to sync all plugins from their repositories';
+
+    public function handle(): int
+    {
+        $plugins = Plugin::all();
+
+        $count = $plugins->count();
+
+        if ($count === 0) {
+            $this->info('No plugins to sync.');
+
+            return self::SUCCESS;
+        }
+
+        $this->info("Dispatching sync jobs for {$count} plugins...");
+
+        $plugins->each(fn (Plugin $plugin) => SyncPlugin::dispatch($plugin));
+
+        $this->info('Done. Jobs have been dispatched to the queue.');
+
+        return self::SUCCESS;
+    }
+}

app/Console/Kernel.php

@@ -23,6 +23,18 @@ protected function schedule(Schedule $schedule): void
             ->dailyAt('10:30')
             ->onOneServer()
             ->runInBackground();
+
+        // Remove GitHub access for users with expired Max licenses
+        $schedule->command('github:remove-expired-access')
+            ->dailyAt('10:00')
+            ->onOneServer()
+            ->runInBackground();
+
+        // Remove Discord Max role for users with expired Max licenses
+        $schedule->command('discord:remove-expired-roles')
+            ->dailyAt('10:30')
+            ->onOneServer()
+            ->runInBackground();
     }
 
     /**

app/Enums/PayoutStatus.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Enums;
+
+enum PayoutStatus: string
+{
+    case Pending = 'pending';
+    case Transferred = 'transferred';
+    case Failed = 'failed';
+
+    public function label(): string
+    {
+        return match ($this) {
+            self::Pending => 'Pending',
+            self::Transferred => 'Transferred',
+            self::Failed => 'Failed',
+        };
+    }
+
+    public function color(): string
+    {
+        return match ($this) {
+            self::Pending => 'yellow',
+            self::Transferred => 'green',
+            self::Failed => 'red',
+        };
+    }
+}