From a4052b1ed53e5c6c46e303604847443533bb16bd Mon Sep 17 00:00:00 2001
From: fsociety <fsociety.mp3@pm.me>
Date: Sun, 29 Sep 2024 19:38:26 +0200
Subject: [PATCH] feat: replace hardcoded relay URL with config variable

This commit replaces hardcoded relay server URL with a configuration variable in services.php. The relay URL is now fetched from the environment variable NOSTR_RELAY. This change has been made in the files Election:year.blade.php and admin/Election:year.blade.php under association/election directory.
---
 config/services.php                           |  2 ++
 .../election/[Election:year].blade.php        | 33 ++++++++++---------
 .../election/admin/[Election:year].blade.php  |  4 +--
 3 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/config/services.php b/config/services.php
index 27a3617..e381dbf 100644
--- a/config/services.php
+++ b/config/services.php
@@ -14,6 +14,8 @@ return [
     |
     */
 
+    'relay' => env('NOSTR_RELAY'),
+
     'postmark' => [
         'token' => env('POSTMARK_TOKEN'),
     ],
diff --git a/resources/views/pages/association/election/[Election:year].blade.php b/resources/views/pages/association/election/[Election:year].blade.php
index 55bdcf5..4327072 100644
--- a/resources/views/pages/association/election/[Election:year].blade.php
+++ b/resources/views/pages/association/election/[Election:year].blade.php
@@ -86,7 +86,7 @@ $loadEvents = function () {
     $requestMessage = new RequestMessage($subscriptionId, $filters);
 
     $relays = [
-        new Relay('ws://relay:7000'),
+        new Relay(config('services.relay')),
     ];
     $relaySet = new RelaySet();
     $relaySet->setRelays($relays);
@@ -94,7 +94,7 @@ $loadEvents = function () {
     $request = new Request($relaySet, $requestMessage);
     $response = $request->send();
 
-    $this->events = collect($response['ws://relay:7000'])
+    $this->events = collect($response[config('services.relay')])
         ->map(fn($event)
             => [
             'id' => $event->event->id,
@@ -133,7 +133,7 @@ $signEvent = function ($event) {
     $note->setTags($event['tags']);
     $note->setCreatedAt($event['created_at']);
     $eventMessage = new EventMessage($note);
-    $relayUrl = 'ws://relay:7000';
+    $relayUrl = config('services.relay');
     $relay = new Relay($relayUrl);
     $relay->setMessage($eventMessage);
     $result = $relay->send();
@@ -429,20 +429,21 @@ $signEvent = function ($event) {
                                                 </div>
                                                 <footer class="mt-5">
                                                     <div class="grid grid-cols-3 gap-y-2">
-                                                            @foreach($electionConfig->firstWhere('type', $type)['candidates'] as $c)
-                                                                <div
-                                                                    @if($isNotClosed)wire:click="vote('{{ $c['pubkey'] }}', '{{ $type }}')"@endif
-                                                                    class="{{ $c['votedClass'] }} cursor-pointer text-xs inline-flex font-medium rounded-full text-center px-2.5 py-1">
-                                                                    <div class="flex items-center">
-                                                                        <img class="w-6 h-6 rounded-full mr-2 bg-black"
-                                                                             src="{{ $c['picture'] ?? 'https://robohash.org/' . $c['pubkey'] }}"
-                                                                             onerror="this.onerror=null; this.src='https://robohash.org/{{ $c['pubkey'] }}';"
-                                                                             width="24" height="24"
-                                                                             alt="{{ $c['name'] }}"/>
-                                                                        {{ $c['name'] }}
-                                                                    </div>
+                                                        @foreach($electionConfig->firstWhere('type', $type)['candidates'] as $c)
+                                                            <div
+                                                                @if($isNotClosed)wire:click="vote('{{ $c['pubkey'] }}', '{{ $type }}')"
+                                                                @endif
+                                                                class="{{ $c['votedClass'] }} cursor-pointer text-xs inline-flex font-medium rounded-full text-center px-2.5 py-1">
+                                                                <div class="flex items-center">
+                                                                    <img class="w-6 h-6 rounded-full mr-2 bg-black"
+                                                                         src="{{ $c['picture'] ?? 'https://robohash.org/' . $c['pubkey'] }}"
+                                                                         onerror="this.onerror=null; this.src='https://robohash.org/{{ $c['pubkey'] }}';"
+                                                                         width="24" height="24"
+                                                                         alt="{{ $c['name'] }}"/>
+                                                                    {{ $c['name'] }}
                                                                 </div>
-                                                            @endforeach
+                                                            </div>
+                                                        @endforeach
                                                     </div>
                                                 </footer>
                                             </div>
diff --git a/resources/views/pages/association/election/admin/[Election:year].blade.php b/resources/views/pages/association/election/admin/[Election:year].blade.php
index 1be04ee..210ac4b 100644
--- a/resources/views/pages/association/election/admin/[Election:year].blade.php
+++ b/resources/views/pages/association/election/admin/[Election:year].blade.php
@@ -126,7 +126,7 @@ $loadEvents = function () {
     $requestMessage = new RequestMessage($subscriptionId, $filters);
 
     $relays = [
-        new Relay('ws://relay:7000'),
+        new Relay(config('services.relay')),
     ];
     $relaySet = new RelaySet();
     $relaySet->setRelays($relays);
@@ -134,7 +134,7 @@ $loadEvents = function () {
     $request = new Request($relaySet, $requestMessage);
     $response = $request->send();
 
-    $this->events = collect($response['ws://relay:7000'])
+    $this->events = collect($response[config('services.relay')])
         ->map(fn($event)
             => [
             'id' => $event->event->id,