From 1aaa955567a83b016372888befc312b753925000 Mon Sep 17 00:00:00 2001
From: HolgerHatGarKeineNode <fsociety.mkv@pm.me>
Date: Thu, 23 Feb 2023 23:12:00 +0100
Subject: [PATCH] nostr added to lecturer form

---
 .../Form/ContentCreatorForm.php               | 27 ++++++-------
 docker/8.2/nostr.json                         | 38 +------------------
 .../form/content-creator-form.blade.php       |  5 +++
 .../news/form/news-article-form.blade.php     |  2 +-
 4 files changed, 21 insertions(+), 51 deletions(-)

diff --git a/app/Http/Livewire/ContentCreator/Form/ContentCreatorForm.php b/app/Http/Livewire/ContentCreator/Form/ContentCreatorForm.php
index 06c88dbb..1e422556 100644
--- a/app/Http/Livewire/ContentCreator/Form/ContentCreatorForm.php
+++ b/app/Http/Livewire/ContentCreator/Form/ContentCreatorForm.php
@@ -22,30 +22,31 @@ class ContentCreatorForm extends Component
     public function rules()
     {
         return [
-            'image' => [Rule::requiredIf(! $this->lecturer->id), 'nullable', 'mimes:jpeg,png,jpg,gif', 'max:10240'],
+            'image' => [Rule::requiredIf(!$this->lecturer->id), 'nullable', 'mimes:jpeg,png,jpg,gif', 'max:10240'],
 
-            'lecturer.name' => 'required',
-            'lecturer.active' => 'boolean',
-            'lecturer.subtitle' => 'required',
-            'lecturer.intro' => 'required',
-            'lecturer.twitter_username' => 'nullable|string',
-            'lecturer.website' => 'nullable|url',
+            'lecturer.name'              => 'required',
+            'lecturer.active'            => 'boolean',
+            'lecturer.subtitle'          => 'required',
+            'lecturer.intro'             => 'required',
+            'lecturer.nostr'             => 'nullable|string',
+            'lecturer.twitter_username'  => 'nullable|string',
+            'lecturer.website'           => 'nullable|url',
             'lecturer.lightning_address' => 'nullable|string',
-            'lecturer.lnurl' => 'nullable|string',
-            'lecturer.node_id' => 'nullable|string',
+            'lecturer.lnurl'             => 'nullable|string',
+            'lecturer.node_id'           => 'nullable|string',
         ];
     }
 
     public function mount()
     {
-        if (! $this->lecturer) {
+        if (!$this->lecturer) {
             $this->lecturer = new Lecturer([
-                'intro' => '',
-                'active' => true,
+                'intro'   => '',
+                'active'  => true,
                 'team_id' => true,
             ]);
         }
-        if (! $this->fromUrl) {
+        if (!$this->fromUrl) {
             $this->fromUrl = url()->previous();
         }
     }
diff --git a/docker/8.2/nostr.json b/docker/8.2/nostr.json
index b1ca6407..24474cb2 100644
--- a/docker/8.2/nostr.json
+++ b/docker/8.2/nostr.json
@@ -1,6 +1,6 @@
 {
     "relays": {
-        "wss://nostr.einundzwanzig.space": {
+        "wss://nostr.easify.de": {
             "read": true,
             "write": true
         },
@@ -8,45 +8,9 @@
             "read": true,
             "write": true
         },
-        "wss://nostr.fmt.wiz.biz": {
-            "read": true,
-            "write": true
-        },
         "wss://relay.damus.io": {
             "read": true,
             "write": true
-        },
-        "wss://nostr-pub.wellorder.net": {
-            "read": true,
-            "write": true
-        },
-        "wss://relay.nostr.info": {
-            "read": true,
-            "write": true
-        },
-        "wss://offchain.pub": {
-            "read": true,
-            "write": true
-        },
-        "wss://nos.lol": {
-            "read": true,
-            "write": true
-        },
-        "wss://brb.io": {
-            "read": true,
-            "write": true
-        },
-        "wss://relay.snort.social": {
-            "read": true,
-            "write": true
-        },
-        "wss://relay.current.fyi": {
-            "read": true,
-            "write": true
-        },
-        "wss://nostr.relayer.se": {
-            "read": true,
-            "write": true
         }
     },
     "following": null,
diff --git a/resources/views/livewire/content-creator/form/content-creator-form.blade.php b/resources/views/livewire/content-creator/form/content-creator-form.blade.php
index d6d006a3..d0e71080 100644
--- a/resources/views/livewire/content-creator/form/content-creator-form.blade.php
+++ b/resources/views/livewire/content-creator/form/content-creator-form.blade.php
@@ -49,6 +49,11 @@
                     <span class="text-gray-400 text-xs py-2">{{ __('This is the introduction text that is shown on the landing page.') }}</span>
                 </x-input.group>
 
+                <x-input.group :for="md5('lecturer.nostr')" :label="__('Nostr public key')">
+                    <x-input autocomplete="off" wire:model.debounce="lecturer.nostr"
+                             :placeholder="__('Nostr public key')" :hint="__('starts with npub...')"/>
+                </x-input.group>
+
                 <x-input.group :for="md5('lecturer.twitter_username')" :label="__('Twitter Username')">
                     <x-input autocomplete="off" wire:model.debounce="lecturer.twitter_username"
                              :placeholder="__('Twitter Username')" :hint="__('Without @')"/>
diff --git a/resources/views/livewire/news/form/news-article-form.blade.php b/resources/views/livewire/news/form/news-article-form.blade.php
index 7d0cdac2..bd407a4f 100644
--- a/resources/views/livewire/news/form/news-article-form.blade.php
+++ b/resources/views/livewire/news/form/news-article-form.blade.php
@@ -38,7 +38,7 @@
                             <div>
                                 {{ __('Author') }}
                             </div>
-                            <x-button xs href="/nova/resources/lecturers/new" target="_blank">
+                            <x-button xs href="{{ route('contentCreator.form', ['country' => 'de']) }}">
                                 <i class="fa fa-thin fa-plus"></i>
                                 {{ __('Create new author') }}
                             </x-button>