move functions to async

This commit is contained in:
Believethehype 2024-06-08 20:07:42 +02:00
parent 686789e04f
commit a2c68409f1
3 changed files with 14 additions and 11 deletions

View File

@ -36,7 +36,8 @@ class AdminConfig:
PRIVKEY: str = ""
async def admin_make_database_updates(adminconfig: AdminConfig = None, dvmconfig: DVMConfig = None, client: Client = None):
async def admin_make_database_updates(adminconfig: AdminConfig = None, dvmconfig: DVMConfig = None,
client: Client = None):
# This is called on start of Server, Admin function to manually whitelist/blacklist/add balance/delete users
if adminconfig is None or dvmconfig is None:
return
@ -65,17 +66,20 @@ async def admin_make_database_updates(adminconfig: AdminConfig = None, dvmconfig
if adminconfig.WHITELISTUSER:
user = await get_or_add_user(db, publickey, client=client, config=dvmconfig)
update_sql_table(db, user.npub, user.balance, True, False, user.nip05, user.lud16, user.name, user.lastactive, user.subscribed)
update_sql_table(db, user.npub, user.balance, True, False, user.nip05, user.lud16, user.name,
user.lastactive, user.subscribed)
user = get_from_sql_table(db, publickey)
print(str(user.name) + " is whitelisted: " + str(user.iswhitelisted))
if adminconfig.UNWHITELISTUSER:
user = get_from_sql_table(db, publickey)
update_sql_table(db, user.npub, user.balance, False, False, user.nip05, user.lud16, user.name, user.lastactive, user.subscribed)
update_sql_table(db, user.npub, user.balance, False, False, user.nip05, user.lud16, user.name,
user.lastactive, user.subscribed)
if adminconfig.BLACKLISTUSER:
user = get_from_sql_table(db, publickey)
update_sql_table(db, user.npub, user.balance, False, True, user.nip05, user.lud16, user.name, user.lastactive, user.subscribed)
update_sql_table(db, user.npub, user.balance, False, True, user.nip05, user.lud16, user.name,
user.lastactive, user.subscribed)
if adminconfig.DELETEUSER:
delete_from_sql_table(db, publickey)
@ -87,11 +91,10 @@ async def admin_make_database_updates(adminconfig: AdminConfig = None, dvmconfig
list_db(db)
if adminconfig.REBROADCAST_NIP89:
nip89_announce_tasks(dvmconfig, client=client)
await nip89_announce_tasks(dvmconfig, client=client)
if adminconfig.REBROADCAST_NIP65_RELAY_LIST:
nip65_announce_relays(dvmconfig, client=client)
await nip65_announce_relays(dvmconfig, client=client)
if adminconfig.REBROADCAST_NIP88:
annotier_id = nip88_announce_tier(dvmconfig, client=client)

View File

@ -5,7 +5,7 @@ from nostr_dvm.utils.nostr_utils import send_event
from nostr_dvm.utils.print import bcolors
def nip65_announce_relays(dvm_config, client):
async def nip65_announce_relays(dvm_config, client):
tags = []
for relay in dvm_config.RELAY_LIST:
@ -16,6 +16,6 @@ def nip65_announce_relays(dvm_config, client):
content = ""
event = EventBuilder(EventDefinitions.KIND_RELAY_ANNOUNCEMENT, content, tags).to_event(keys)
eventid = send_event(event, client=client, dvm_config=dvm_config, blastr=True)
eventid = await send_event(event, client=client, dvm_config=dvm_config, blastr=True)
print(bcolors.BLUE + "[" + dvm_config.NIP89.NAME + "] Announced NIP 65 for " + dvm_config.NIP89.NAME +" (EventID: " + eventid.to_hex() +")" + bcolors.ENDC)

View File

@ -25,13 +25,13 @@ def nip89_create_d_tag(name, pubkey, image):
return d_tag
def nip89_announce_tasks(dvm_config, client):
async def nip89_announce_tasks(dvm_config, client):
k_tag = Tag.parse(["k", str(dvm_config.NIP89.KIND.as_u64())])
d_tag = Tag.parse(["d", dvm_config.NIP89.DTAG])
keys = Keys.parse(dvm_config.NIP89.PK)
content = dvm_config.NIP89.CONTENT
event = EventBuilder(EventDefinitions.KIND_ANNOUNCEMENT, content, [k_tag, d_tag]).to_event(keys)
evenid = send_event(event, client=client, dvm_config=dvm_config)
evenid = await send_event(event, client=client, dvm_config=dvm_config)
print(bcolors.BLUE + "[" + dvm_config.NIP89.NAME + "] Announced NIP 89 for " + dvm_config.NIP89.NAME +" (" + evenid.to_hex() +")" + bcolors.ENDC)