lnbits-exts/nostrrelay
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions 2

feat: finish NIP16

Browse source
This commit is contained in:
Vlad Stan 2023-02-17 09:55:23 +02:00
parent a1d7c474b0
commit 5c0209b6c0
3 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
client_manager.py
View file

@ -210,9 +210,10 @@ class NostrClientConnection:
try: try:
if e.is_replaceable_event: if e.is_replaceable_event:
await delete_events( await delete_events(
self.relay_id, NostrFilter(kinds=[e.kind], authors=[e.pubkey]) self.relay_id, NostrFilter(kinds=[e.kind], authors=[e.pubkey], until=e.created_at)
) )
await create_event(self.relay_id, e, self.pubkey) if not e.is_ephemeral_event:
await create_event(self.relay_id, e, self.pubkey)
await self._broadcast_event(e) await self._broadcast_event(e)
if e.is_delete_event: if e.is_delete_event:
@ -307,6 +308,9 @@ class NostrClientConnection:
if not valid: if not valid:
return (valid, message) return (valid, message)
if e.is_ephemeral_event:
return True, ""
publisher_pubkey = self.pubkey if self.pubkey else e.pubkey publisher_pubkey = self.pubkey if self.pubkey else e.pubkey
valid, message = await self._validate_storage(publisher_pubkey, e.size_bytes) valid, message = await self._validate_storage(publisher_pubkey, e.size_bytes)
if not valid: if not valid:

9
models.py
View file

@ -167,7 +167,7 @@ class NostrEvent(BaseModel):
@property @property
def is_replaceable_event(self) -> bool: def is_replaceable_event(self) -> bool:
return self.kind in [0, 3, 41] return self.kind in [0, 3, 41] or (self.kind >= 10000 and self.kind < 20000)
@property @property
def is_auth_response_event(self) -> bool: def is_auth_response_event(self) -> bool:
@ -181,9 +181,14 @@ class NostrEvent(BaseModel):
def is_delete_event(self) -> bool: def is_delete_event(self) -> bool:
return self.kind == 5 return self.kind == 5
@property
def is_regular_event(self) -> bool:
return self.kind >= 1000 and self.kind < 10000
@property @property
def is_ephemeral_event(self) -> bool: def is_ephemeral_event(self) -> bool:
return self.kind in [22242] return self.kind >= 20000 and self.kind < 30000
def check_signature(self): def check_signature(self):
event_id = self.event_id event_id = self.event_id

2
tests/test_events.py
View file

@ -59,7 +59,7 @@ async def test_valid_event_crud(valid_events: List[EventFixture]):
# insert all events in DB before doing an query # insert all events in DB before doing an query
for e in all_events: for e in all_events:
await create_event(RELAY_ID, e) await create_event(RELAY_ID, e, None)
for f in valid_events: for f in valid_events:
await get_by_id(f.data, f.name) await get_by_id(f.data, f.name)