highperfocused/nostrdvm
1
0
Fork 0
mirror of https://github.com/believethehype/nostrdvm.git synced 2025-06-22 21:00:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix circular import

Browse Source
This commit is contained in:
dbth 2024-12-30 23:04:14 +01:00
parent 08ff4fcce5
commit 24f2f70d1c
2 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
nostr_dvm/utils/nip65_utils.py
View File

@ -1,20 +1,20 @@
from nostr_sdk import Tag, Keys, EventBuilder, Kind from nostr_sdk import Tag, Keys, EventBuilder, Kind
from nostr_dvm.utils.definitions import EventDefinitions from nostr_dvm.utils.definitions import EventDefinitions
from nostr_dvm.utils.dvmconfig import DVMConfig
from nostr_dvm.utils.nostr_utils import send_event from nostr_dvm.utils.nostr_utils import send_event
from nostr_dvm.utils.print_utils import bcolors from nostr_dvm.utils.print_utils import bcolors
async def announce_dm_relays(dvm_config, client): async def announce_dm_relays(dvm_config, client):
tags = [] tags = []
relays_to_publish = DVMConfig.ANNOUNCE_RELAY_LIST
RELAY_LIST = dvm_config.ANNOUNCE_RELAY_LIST
for relay in dvm_config.RELAY_LIST: for relay in dvm_config.RELAY_LIST:
if relay not in relays_to_publish: if relay not in RELAY_LIST:
relays_to_publish.append(relay) RELAY_LIST.append(relay)
for relay in relays_to_publish: dvm_config.RELAY_LIST = RELAY_LIST
for relay in RELAY_LIST:
r_tag = Tag.parse(["r", relay]) r_tag = Tag.parse(["r", relay])
tags.append(r_tag) tags.append(r_tag)
@ -38,14 +38,14 @@ async def nip65_announce_relays(dvm_config, client):
tags = [] tags = []
relays_to_publish = DVMConfig.ANNOUNCE_RELAY_LIST RELAY_LIST = dvm_config.ANNOUNCE_RELAY_LIST
for relay in dvm_config.RELAY_LIST: for relay in dvm_config.RELAY_LIST:
if relay not in relays_to_publish: if relay not in RELAY_LIST:
relays_to_publish.append(relay) RELAY_LIST.append(relay)
dvm_config.RELAY_LIST = RELAY_LIST
for relay in relays_to_publish: for relay in RELAY_LIST:
r_tag = Tag.parse(["r", relay]) r_tag = Tag.parse(["r", relay])
tags.append(r_tag) tags.append(r_tag)

8
nostr_dvm/utils/nip89_utils.py
View File

@ -6,7 +6,6 @@ import dotenv
from nostr_sdk import Tag, Keys, EventBuilder, Filter, Alphabet, PublicKey, Client, EventId, SingleLetterTag, Kind from nostr_sdk import Tag, Keys, EventBuilder, Filter, Alphabet, PublicKey, Client, EventId, SingleLetterTag, Kind
from nostr_dvm.utils.definitions import EventDefinitions, relay_timeout from nostr_dvm.utils.definitions import EventDefinitions, relay_timeout
from nostr_dvm.utils.dvmconfig import DVMConfig
from nostr_dvm.utils.nostr_utils import send_event from nostr_dvm.utils.nostr_utils import send_event
from nostr_dvm.utils.print_utils import bcolors from nostr_dvm.utils.print_utils import bcolors
@ -32,11 +31,10 @@ async def nip89_announce_tasks(dvm_config, client):
content = dvm_config.NIP89.CONTENT content = dvm_config.NIP89.CONTENT
event = EventBuilder(EventDefinitions.KIND_ANNOUNCEMENT, content).tags([k_tag, d_tag]).sign_with_keys(keys) event = EventBuilder(EventDefinitions.KIND_ANNOUNCEMENT, content).tags([k_tag, d_tag]).sign_with_keys(keys)
new_dvm_config = DVMConfig() RELAY_LIST = dvm_config.ANNOUNCE_RELAY_LIST
new_dvm_config.RELAY_LIST = new_dvm_config.ANNOUNCE_RELAY_LIST
for relay in dvm_config.RELAY_LIST: for relay in dvm_config.RELAY_LIST:
if relay not in new_dvm_config.RELAY_LIST: if relay not in RELAY_LIST:
new_dvm_config.RELAY_LIST.append(relay) dvm_config.RELAY_LIST.append(relay)
eventid = await send_event(event, client=client, dvm_config=dvm_config) eventid = await send_event(event, client=client, dvm_config=dvm_config)
print( print(