chore: code clean-up

nostr/client/client.py

@@ -1,19 +1,9 @@
-import base64
-import json
-import os
 import time
 from typing import *
 
-from ..event import EncryptedDirectMessage, Event, EventKind
-from ..filter import Filter, Filters
-from ..key import PrivateKey, PublicKey
-from ..message_type import ClientMessageType
 from ..relay_manager import RelayManager
 from ..subscription import Subscription
 
-# from aes import AESCipher
-from . import cbc
-
 
 class NostrClient:
     relays = [
@@ -23,12 +13,8 @@ class NostrClient:
         "wss://nostr.oxtr.dev",
     ]  # ["wss://nostr.oxtr.dev"]  # ["wss://relay.nostr.info"] "wss://nostr-pub.wellorder.net"  "ws://91.237.88.218:2700", "wss://nostrrr.bublina.eu.org", ""wss://nostr-relay.freeberty.net"", , "wss://nostr.oxtr.dev", "wss://relay.nostr.info", "wss://nostr-pub.wellorder.net" , "wss://relayer.fiatjaf.com", "wss://nodestr.fmt.wiz.biz/", "wss://no.str.cr"
     relay_manager = RelayManager()
-    private_key: PrivateKey
-    public_key: PublicKey
-
-    def __init__(self, privatekey_hex: str = "", relays: List[str] = [], connect=True):
-        self.generate_keys(privatekey_hex)
 
+    def __init__(self, relays: List[str] = [], connect=True):
         if len(relays):
             self.relays = relays
         if connect:
@@ -43,87 +29,6 @@ class NostrClient:
     def close(self):
         self.relay_manager.close_connections()
 
-    def generate_keys(self, privatekey_hex: str = None):
-        pk = bytes.fromhex(privatekey_hex) if privatekey_hex else None
-        self.private_key = PrivateKey(pk)
-        self.public_key = self.private_key.public_key
-
-    def post(self, message: str):
-        event = Event(message, self.public_key.hex(), kind=EventKind.TEXT_NOTE)
-        self.private_key.sign_event(event)
-        event_json = event.to_message()
-        # print("Publishing message:")
-        # print(event_json)
-        self.relay_manager.publish_message(event_json)
-
-    def get_post(
-        self, sender_publickey: PublicKey = None, callback_func=None, filter_kwargs={}
-    ):
-        filter = Filter(
-            authors=[sender_publickey.hex()] if sender_publickey else None,
-            kinds=[EventKind.TEXT_NOTE],
-            **filter_kwargs,
-        )
-        filters = Filters([filter])
-        subscription_id = os.urandom(4).hex()
-        self.relay_manager.add_subscription(subscription_id, filters)
-
-        request = [ClientMessageType.REQUEST, subscription_id]
-        request.extend(filters.to_json_array())
-        message = json.dumps(request)
-        self.relay_manager.publish_message(message)
-
-        while True:
-            while self.relay_manager.message_pool.has_events():
-                event_msg = self.relay_manager.message_pool.get_event()
-                if callback_func:
-                    callback_func(event_msg.event)
-            time.sleep(0.1)
-
-    def dm(self, message: str, to_pubkey: PublicKey):
-        dm = EncryptedDirectMessage(
-            recipient_pubkey=to_pubkey.hex(), cleartext_content=message
-        )
-        self.private_key.sign_event(dm)
-        self.relay_manager.publish_event(dm)
-
-    def get_dm(self, sender_publickey: PublicKey, callback_func=None):
-        filters = Filters(
-            [
-                Filter(
-                    kinds=[EventKind.ENCRYPTED_DIRECT_MESSAGE],
-                    pubkey_refs=[sender_publickey.hex()],
-                )
-            ]
-        )
-        subscription_id = os.urandom(4).hex()
-        self.relay_manager.add_subscription(subscription_id, filters)
-
-        request = [ClientMessageType.REQUEST, subscription_id]
-        request.extend(filters.to_json_array())
-        message = json.dumps(request)
-        self.relay_manager.publish_message(message)
-
-        while True:
-            while self.relay_manager.message_pool.has_events():
-                event_msg = self.relay_manager.message_pool.get_event()
-                if "?iv=" in event_msg.event.content:
-                    try:
-                        shared_secret = self.private_key.compute_shared_secret(
-                            event_msg.event.public_key
-                        )
-                        aes = cbc.AESCipher(key=shared_secret)
-                        enc_text_b64, iv_b64 = event_msg.event.content.split("?iv=")
-                        iv = base64.decodebytes(iv_b64.encode("utf-8"))
-                        enc_text = base64.decodebytes(enc_text_b64.encode("utf-8"))
-                        dec_text = aes.decrypt(iv, enc_text)
-                        if callback_func:
-                            callback_func(event_msg.event, dec_text)
-                    except:
-                        pass
-                break
-            time.sleep(0.1)
-
     def subscribe(
         self,
         callback_events_func=None,

nostr/relay.py

@@ -122,11 +122,6 @@ class Relay:
         with self.lock:
             self.subscriptions.pop(id)
 
-    def update_subscription(self, id: str, filters: Filters) -> None:
-        with self.lock:
-            subscription = self.subscriptions[id]
-            subscription.filters = filters
-
     def to_json_object(self) -> dict:
         return {
             "url": self.url,

tasks.py

@@ -31,7 +31,6 @@ async def subscribe_events():
         await asyncio.sleep(2)
 
     def callback_events(eventMessage: EventMessage):
-        # print(f"From {event.public_key[:3]}..{event.public_key[-3:]}: {event.content}")
         if eventMessage.subscription_id in received_subscription_events:
             # do not add duplicate events (by event id)
             if eventMessage.event.id in set(