Merge pull request #5 from callebtc/fix/dataclass_update

fix: Events initialization

Author: callebtc

nostr/message_pool.py

@@ -4,30 +4,34 @@
 from .message_type import RelayMessageType
 from .event import Event
 
+
 class EventMessage:
     def __init__(self, event: Event, subscription_id: str, url: str) -> None:
         self.event = event
         self.subscription_id = subscription_id
         self.url = url
 
+
 class NoticeMessage:
     def __init__(self, content: str, url: str) -> None:
         self.content = content
         self.url = url
 
+
 class EndOfStoredEventsMessage:
     def __init__(self, subscription_id: str, url: str) -> None:
         self.subscription_id = subscription_id
         self.url = url
 
+
 class MessagePool:
     def __init__(self) -> None:
         self.events: Queue[EventMessage] = Queue()
         self.notices: Queue[NoticeMessage] = Queue()
         self.eose_notices: Queue[EndOfStoredEventsMessage] = Queue()
         self._unique_events: set = set()
         self.lock: Lock = Lock()
-    
+
     def add_message(self, message: str, url: str):
         self._process_message(message, url)
 
@@ -55,7 +59,14 @@ def _process_message(self, message: str, url: str):
         if message_type == RelayMessageType.EVENT:
             subscription_id = message_json[1]
             e = message_json[2]
-            event = Event(e['pubkey'], e['content'], e['created_at'], e['kind'], e['tags'], e['id'], e['sig'])
+            event = Event(
+                e["content"],
+                e["pubkey"],
+                e["created_at"],
+                e["kind"],
+                e["tags"],
+                e["sig"],
+            )
             with self.lock:
                 if not event.id in self._unique_events:
                     self.events.put(EventMessage(event, subscription_id, url))
@@ -64,5 +75,3 @@ def _process_message(self, message: str, url: str):
             self.notices.put(NoticeMessage(message_json[1], url))
         elif message_type == RelayMessageType.END_OF_STORED_EVENTS:
             self.eose_notices.put(EndOfStoredEventsMessage(message_json[1], url))
-
-

nostr/relay.py

@@ -135,12 +135,11 @@ def _is_valid_message(self, message: str) -> bool:
 
             e = message_json[2]
             event = Event(
-                e["pubkey"],
                 e["content"],
+                e["pubkey"],
                 e["created_at"],
                 e["kind"],
                 e["tags"],
-                e["id"],
                 e["sig"],
             )
             if not event.verify():