🛠️ Add Nostr publishing support with i18n templates and country‑specific configuration for domain handling and CLI command

app/Console/Commands/Nostr/PublishUnpublishedItems.php

@@ -2,46 +2,98 @@
 
 namespace App\Console\Commands\Nostr;
 
+use App\Models\Course;
+use App\Models\CourseEvent;
+use App\Models\Meetup;
+use App\Models\MeetupEvent;
 use App\Traits\NostrTrait;
 use Illuminate\Console\Command;
+use Illuminate\Database\Eloquent\Model;
 
 class PublishUnpublishedItems extends Command
 {
     use NostrTrait;
 
-    /**
-     * The name and signature of the console command.
-     * @var string
-     */
     protected $signature = 'nostr:publish {--model=}';
+    protected $description = 'Publish unpublished items to Nostr';
 
-    /**
-     * The console command description.
-     * @var string
-     */
-    protected $description = 'Command description';
+    private const TZ_MAP = [
+        'de' => 'Europe/Berlin',
+        'nl' => 'Europe/Amsterdam',
+        'hu' => 'Europe/Budapest',
+        'pl' => 'Europe/Warsaw',
+        'es' => 'Europe/Madrid',
+        'pt' => 'Europe/Lisbon',
+    ];
 
-    /**
-     * Execute the console command.
-     */
     public function handle(): void
     {
-        config(['app.user-timezone' => 'Europe/Berlin']);
         $modelName = $this->option('model');
-        $className = '\\App\Models\\' . $modelName;
-        $model = $className::query()
-            ->whereNull('nostr_status')
-            ->when($modelName === 'BitcoinEvent', fn($q) => $q->where('from', '>', now()))
-            ->when($modelName === 'CourseEvent', fn($q) => $q->where('from', '>', now()))
-            ->when($modelName === 'MeetupEvent', fn($q) => $q->where('start', '>', now()))
-            ->when($modelName === 'LibraryItem', fn($q) => $q
-                ->where('type', '<>', 'markdown_article')
-                ->where('type', '<>', 'bindle')
-            )
-            ->orderByDesc('created_at')
-            ->first();
-        if ($model) {
-            $this->publishOnNostr($model, $this->getText($model));
+        $modelClass = '\\App\\Models\\'.$modelName;
+
+        // Define query logic per model type
+        $query = match ($modelName) {
+            'Course' => $modelClass::whereNull('nostr_status')->orderByDesc('created_at'),
+            'CourseEvent' => $modelClass::whereNull('nostr_status')
+                ->where('from', '>', now())
+                ->orderByDesc('created_at'),
+            'Meetup' => $modelClass::with('city.country')
+                ->whereNull('nostr_status')
+                ->orderByDesc('created_at'),
+            'MeetupEvent' => $modelClass::with('meetup.city.country')
+                ->whereNull('nostr_status')
+                ->where('start', '>', now())
+                ->orderByDesc('created_at'),
+            default => null,
+        };
+
+        if (!$query) {
+            $this->error("Unsupported model: {$modelName}");
+            return;
+        }
+
+        $model = $query->first();
+
+        if (!$model) {
+            $this->info("No unpublished items for model: {$modelName}");
+            return;
+        }
+
+        // Get country code and configure timezone/locale if applicable
+        $countryCode = $this->getCountryCode($model);
+        $this->configureForCountry($countryCode);
+
+        $text = $this->getText($model, $countryCode);
+        if ($text) {
+            $result = $this->publishOnNostr($model, $text);
+            if ($result['success']) {
+                $this->info("Published successfully for {$modelName}");
+            } else {
+                $this->error("Failed to publish for {$modelName}: ".$result['errorOutput']);
+            }
+        } else {
+            $this->error("No text generated for {$modelName}");
         }
     }
+
+    private function getCountryCode(Model $model): string
+    {
+        return match (true) {
+            $model instanceof Meetup => $model->city?->country?->code ?? 'de',
+            $model instanceof MeetupEvent => $model->meetup?->city?->country?->code ?? 'de',
+            $model instanceof Course => $model->lecturer?->country?->code ?? 'de',
+            $model instanceof CourseEvent => $model->course?->lecturer?->country?->code ?? 'de',
+            default => 'de', // Default fallback
+        };
+    }
+
+    private function configureForCountry(string $countryCode): void
+    {
+        // Set user timezone and locale based on country code
+        $timezone = self::TZ_MAP[$countryCode] ?? 'UTC';
+        config([
+            'app.user-timezone' => $timezone,
+            'app.locale' => $countryCode,
+        ]);
+    }
 }

app/Http/Middleware/DomainMiddleware.php

@@ -30,11 +30,17 @@ class DomainMiddleware
                 'lang_country' => 'pl-PL',
                 'app_name' => 'DWADZIEŚCIA JEDEN Portal',
             ],
+
             'pl.localhost' => [
                 'locale' => 'pl',
                 'lang_country' => 'pl-PL',
                 'app_name' => 'DWADZIEŚCIA JEDEN Portal',
             ],
+            'hu.localhost' => [
+                'locale' => 'hu',
+                'lang_country' => 'hu-HU',
+                'app_name' => 'HUSZONEGY Portál',
+            ],
         ];
 
         // App-Locale dynamisch setzen

app/Models/Meetup.php

@@ -76,7 +76,7 @@ class Meetup extends Model implements HasMedia
         $this
             ->addMediaCollection('logo')
             ->singleFile()
-            ->useFallbackUrl(asset('img/einundzwanzig.png'));
+            ->useFallbackUrl(get_domain_image());
     }
 
     public function createdBy(): BelongsTo

app/Traits/NostrTrait.php

@@ -6,11 +6,12 @@ use App\Models\Course;
 use App\Models\CourseEvent;
 use App\Models\Meetup;
 use App\Models\MeetupEvent;
+use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\Process;
 
 trait NostrTrait
 {
-    public function publishOnNostr($model, $text): array
+    public function publishOnNostr(Model $model, string $text): array
     {
         if (app()->environment('local')) {
             return [
@@ -21,12 +22,12 @@ trait NostrTrait
             ];
         }
 
-        //noscl publish "Good morning!"
+        // Use array to pass arguments safely and avoid shell injection
         $result = Process::timeout(60 * 5)
-            ->run('noscl publish "'.$text.'"');
+            ->run(['noscl', 'publish', $text]);
 
         if ($result->successful()) {
-            $model->nostr_status = $result->output();
+            $model->nostr_status = trim($result->output());
             $model->save();
         }
 
@@ -38,67 +39,63 @@ trait NostrTrait
         ];
     }
 
-    public function getText($model)
+    public function getText(Model $model, string $countryCode): string|null
     {
-        $from = '';
-        if ($model instanceof CourseEvent) {
-            if ($model->course->lecturer->nostr) {
-                $from .= '@'.$model->course->lecturer->nostr;
-            } else {
-                $from .= $model->course->lecturer->name;
-            }
+        return match (true) {
+            $model instanceof CourseEvent => __('nostr.course_event_text', [
+                'from' => $this->getFrom($model),
+                'name' => $model->course->name,
+                'description' => str($model->course->description)->toString(),
+                'url' => $this->getUrl($model, $countryCode),
+            ]),
+            $model instanceof MeetupEvent => __('nostr.meetup_event_text', [
+                'from' => $this->getFrom($model),
+                'start' => $model->start->asDateTime(),
+                'location' => $model->location,
+                'url' => $this->getUrl($model, $countryCode),
+            ]),
+            $model instanceof Meetup => __('nostr.meetup_text', [
+                'from' => $this->getFrom($model),
+                'url' => $this->getUrl($model, $countryCode),
+            ]),
+            $model instanceof Course => __('nostr.course_text', [
+                'from' => $this->getFrom($model),
+                'name' => $model->name,
+                'description' => str($model->description)->toString(),
+                'url' => $this->getUrl($model, $countryCode),
+            ]),
+            default => null,
+        };
+    }
 
-            return sprintf("Unser Dozent %s hat einen neuen Kurs-Termin eingestellt:\n%s\n%s\n%s\n\n#Bitcoin #Kurs #Education #Einundzwanzig #gesundesgeld #einundzwanzig_portal_lecturer_%s",
-                $from,
-                $model->course->name,
-                str($model->course->description)->toString(),
-                url()->route('courses.landingpage',
-                    ['country' => str(session('lang_country', 'de'))->after('-')->lower(), 'course' => $model->course]),
-                str($model->course->lecturer->slug)->replace('-', '_'),
-            );
-        }
-        if ($model instanceof MeetupEvent) {
-            $from = $model->meetup->name;
-            if ($model->meetup->nostr) {
-                $from .= ' @'.$model->meetup->nostr;
-            }
-
-            return sprintf("%s hat einen neuen Termin eingestellt:\n%s\n%s\n%s\n\n#Bitcoin #Meetup #Einundzwanzig #gesundesgeld #einundzwanzig_portal_%s",
-                $from,
-                $model->start->asDateTime(),
-                $model->location,
-                url()->route('meetups.landingpage-event',
-                    ['country' => str(session('lang_country', 'de'))->after('-')->lower(), 'meetup' => $model->meetup, 'event' => $model]),
-                str($model->meetup->slug)->replace('-', '_'),
-            );
-        }
-        if ($model instanceof Meetup) {
-            $from = $model->name;
-            if ($model->nostr) {
-                $from .= ' @'.$model->nostr;
-            }
-
-            return sprintf("Eine neue Meetup Gruppe wurde hinzugefügt:\n%s\n%s\n\n#Bitcoin #Meetup #Einundzwanzig #gesundesgeld #einundzwanzig_portal_%s",
-                $from,
-                url()->route('meetups.landingpage', ['country' => $model->city->country->code, 'meetup' => $model]),
-                str($model->slug)->replace('-', '_'),
-            );
-        }
+    private function getFrom(Model $model): string
+    {
         if ($model instanceof Course) {
-            if ($model->lecturer->nostr) {
-                $from .= '@'.$model->lecturer->nostr;
-            } else {
-                $from .= $model->lecturer->name;
-            }
-
-            return sprintf("Unser Dozent %s hat einen neuen Kurs eingestellt:\n%s\n%s\n%s\n\n#Bitcoin #Kurs #Education #Einundzwanzig #gesundesgeld #einundzwanzig_portal_lecturer_%s",
-                $from,
-                $model->name,
-                str($model->description)->toString(),
-                url()->route('courses.landingpage',
-                    ['country' => str(session('lang_country', 'de'))->after('-')->lower(), 'course' => $model]),
-                str($model->lecturer->slug)->replace('-', '_'),
-            );
+            return $model->lecturer->nostr ? '@'.$model->lecturer->nostr : $model->lecturer->name;
+        } elseif ($model instanceof CourseEvent) {
+            return $this->getFrom($model->course);
+        } elseif ($model instanceof Meetup) {
+            return $model->name.($model->nostr ? ' @'.$model->nostr : '');
+        } elseif ($model instanceof MeetupEvent) {
+            return $this->getFrom($model->meetup);
         }
+
+        return '';
+    }
+
+    private function getUrl(Model $model, string $countryCode): string
+    {
+        if ($model instanceof Course) {
+            return route('courses.landingpage', ['country' => $countryCode, 'course' => $model]);
+        } elseif ($model instanceof CourseEvent) {
+            return route('courses.landingpage', ['country' => $countryCode, 'course' => $model->course]);
+        } elseif ($model instanceof Meetup) {
+            return route('meetups.landingpage', ['country' => $countryCode, 'meetup' => $model]);
+        } elseif ($model instanceof MeetupEvent) {
+            return route('meetups.landingpage-event',
+                ['country' => $countryCode, 'meetup' => $model->meetup, 'event' => $model]);
+        }
+
+        return '';
     }
 }