update client

nostr/event.py

@@ -6,8 +6,7 @@ from typing import List
 from secp256k1 import PrivateKey, PublicKey
 from hashlib import sha256
 
-from nostr.message_type import ClientMessageType
-
+from .message_type import ClientMessageType
 
 
 class EventKind(IntEnum):
@@ -19,17 +18,17 @@ class EventKind(IntEnum):
     DELETE = 5
 
 
-
 @dataclass
 class Event:
     content: str = None
     public_key: str = None
     created_at: int = None
     kind: int = EventKind.TEXT_NOTE
-    tags: List[List[str]] = field(default_factory=list)  # Dataclasses require special handling when the default value is a mutable type
+    tags: List[List[str]] = field(
+        default_factory=list
+    )  # Dataclasses require special handling when the default value is a mutable type
     signature: str = None
 
-
     def __post_init__(self):
         if self.content is not None and not isinstance(self.content, str):
             # DMs initialize content to None but all other kinds should pass in a str
@@ -38,39 +37,44 @@ class Event:
         if self.created_at is None:
             self.created_at = int(time.time())
 
-
     @staticmethod
-    def serialize(public_key: str, created_at: int, kind: int, tags: List[List[str]], content: str) -> bytes:
+    def serialize(
+        public_key: str, created_at: int, kind: int, tags: List[List[str]], content: str
+    ) -> bytes:
         data = [0, public_key, created_at, kind, tags, content]
-        data_str = json.dumps(data, separators=(',', ':'), ensure_ascii=False)
+        data_str = json.dumps(data, separators=(",", ":"), ensure_ascii=False)
         return data_str.encode()
 
-
     @staticmethod
-    def compute_id(public_key: str, created_at: int, kind: int, tags: List[List[str]], content: str):
-        return sha256(Event.serialize(public_key, created_at, kind, tags, content)).hexdigest()
-
+    def compute_id(
+        public_key: str, created_at: int, kind: int, tags: List[List[str]], content: str
+    ):
+        return sha256(
+            Event.serialize(public_key, created_at, kind, tags, content)
+        ).hexdigest()
 
     @property
     def id(self) -> str:
         # Always recompute the id to reflect the up-to-date state of the Event
-        return Event.compute_id(self.public_key, self.created_at, self.kind, self.tags, self.content)
+        return Event.compute_id(
+            self.public_key, self.created_at, self.kind, self.tags, self.content
+        )
 
+    def add_pubkey_ref(self, pubkey: str):
+        """Adds a reference to a pubkey as a 'p' tag"""
+        self.tags.append(["p", pubkey])
 
-    def add_pubkey_ref(self, pubkey:str):
-        """ Adds a reference to a pubkey as a 'p' tag """
-        self.tags.append(['p', pubkey])
-
-
-    def add_event_ref(self, event_id:str):
-        """ Adds a reference to an event_id as an 'e' tag """
-        self.tags.append(['e', event_id])
-
+    def add_event_ref(self, event_id: str):
+        """Adds a reference to an event_id as an 'e' tag"""
+        self.tags.append(["e", event_id])
 
     def verify(self) -> bool:
-        pub_key = PublicKey(bytes.fromhex("02" + self.public_key), True)  # add 02 for schnorr (bip340)
-        return pub_key.schnorr_verify(bytes.fromhex(self.id), bytes.fromhex(self.signature), None, raw=True)
-
+        pub_key = PublicKey(
+            bytes.fromhex("02" + self.public_key), True
+        )  # add 02 for schnorr (bip340)
+        return pub_key.schnorr_verify(
+            bytes.fromhex(self.id), bytes.fromhex(self.signature), None, raw=True
+        )
 
     def to_message(self) -> str:
         return json.dumps(
@@ -83,20 +87,18 @@ class Event:
                     "kind": self.kind,
                     "tags": self.tags,
                     "content": self.content,
-                    "sig": self.signature
-                }
+                    "sig": self.signature,
+                },
             ]
         )
 
 
-
 @dataclass
 class EncryptedDirectMessage(Event):
     recipient_pubkey: str = None
     cleartext_content: str = None
     reference_event_id: str = None
 
-
     def __post_init__(self):
         if self.content is not None:
             self.cleartext_content = self.content
@@ -115,9 +117,10 @@ class EncryptedDirectMessage(Event):
         if self.reference_event_id is not None:
             self.add_event_ref(self.reference_event_id)
 
-
     @property
     def id(self) -> str:
         if self.content is None:
-            raise Exception("EncryptedDirectMessage `id` is undefined until its message is encrypted and stored in the `content` field")
+            raise Exception(
+                "EncryptedDirectMessage `id` is undefined until its message is encrypted and stored in the `content` field"
+            )
         return super().id