allow a list of users to be managed in admin_config

This commit is contained in:
Believethehype 2024-03-07 17:17:58 +01:00
parent b08962bbb3
commit 5ea368b0a8
2 changed files with 23 additions and 19 deletions

View File

@ -39,6 +39,9 @@ def playground():
admin_config = AdminConfig() admin_config = AdminConfig()
admin_config.REBROADCAST_NIP89 = False admin_config.REBROADCAST_NIP89 = False
admin_config.LUD16 = lnaddress admin_config.LUD16 = lnaddress
# Set rebroadcast to true once you have set your NIP89 descriptions and d tags. You only need to rebroadcast once you # Set rebroadcast to true once you have set your NIP89 descriptions and d tags. You only need to rebroadcast once you
# want to update your NIP89 descriptions # want to update your NIP89 descriptions

View File

@ -20,7 +20,7 @@ class AdminConfig:
LISTDATABASE: bool = False LISTDATABASE: bool = False
ClEANDB: bool = False ClEANDB: bool = False
USERNPUB: str = "" USERNPUBS: list = []
LUD16: str = "" LUD16: str = ""
EVENTID: str = "" EVENTID: str = ""
@ -37,7 +37,7 @@ def admin_make_database_updates(adminconfig: AdminConfig = None, dvmconfig: DVMC
if (( if ((
adminconfig.WHITELISTUSER is True or adminconfig.UNWHITELISTUSER is True or adminconfig.BLACKLISTUSER is True or adminconfig.DELETEUSER is True) adminconfig.WHITELISTUSER is True or adminconfig.UNWHITELISTUSER is True or adminconfig.BLACKLISTUSER is True or adminconfig.DELETEUSER is True)
and adminconfig.USERNPUB == ""): and adminconfig.USERNPUBS == []):
return return
if adminconfig.UPDATE_PROFILE and (dvmconfig.NIP89 is None): if adminconfig.UPDATE_PROFILE and (dvmconfig.NIP89 is None):
@ -48,27 +48,28 @@ def admin_make_database_updates(adminconfig: AdminConfig = None, dvmconfig: DVMC
db = dvmconfig.DB db = dvmconfig.DB
if str(adminconfig.USERNPUB).startswith("npub"): for npub in adminconfig.USERNPUBS:
publickey = PublicKey.from_bech32(adminconfig.USERNPUB).to_hex() if str(npub).startswith("npub"):
else: publickey = PublicKey.from_bech32(npub).to_hex()
publickey = adminconfig.USERNPUB else:
publickey = npub
if adminconfig.WHITELISTUSER: if adminconfig.WHITELISTUSER:
user = get_or_add_user(db, publickey, client=client, config=dvmconfig) user = 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) update_sql_table(db, user.npub, user.balance, True, False, user.nip05, user.lud16, user.name, user.lastactive)
user = get_from_sql_table(db, publickey) user = get_from_sql_table(db, publickey)
print(str(user.name) + " is whitelisted: " + str(user.iswhitelisted)) print(str(user.name) + " is whitelisted: " + str(user.iswhitelisted))
if adminconfig.UNWHITELISTUSER: if adminconfig.UNWHITELISTUSER:
user = get_from_sql_table(db, publickey) 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) update_sql_table(db, user.npub, user.balance, False, False, user.nip05, user.lud16, user.name, user.lastactive)
if adminconfig.BLACKLISTUSER: if adminconfig.BLACKLISTUSER:
user = get_from_sql_table(db, publickey) 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) update_sql_table(db, user.npub, user.balance, False, True, user.nip05, user.lud16, user.name, user.lastactive)
if adminconfig.DELETEUSER: if adminconfig.DELETEUSER:
delete_from_sql_table(db, publickey) delete_from_sql_table(db, publickey)
if adminconfig.ClEANDB: if adminconfig.ClEANDB:
clean_db(db) clean_db(db)