diff --git a/bot.py b/bot.py index f7db5e5..3d23ece 100644 --- a/bot.py +++ b/bot.py @@ -148,6 +148,7 @@ async def verify(ctx, domain:str): message += f"If you use Namebase, you can do this automatically by visiting the following link:\n" message += f"\n\n" message += f"Once the record is set (this may take a few minutes) you can run this command again or manually set your nickname to `{name_rendered}/`." + message += f"\n\nAlternatively, you can set the TXT record onchain, this will take longer to propagate.\n\n" await ctx.response.send_message(message,ephemeral=True) @@ -157,6 +158,8 @@ async def verify(ctx, domain:str): @client.event async def on_ready(): global ADMINID + if not client.application: + return # not fully ready yet ADMINID = client.application.owner.id await tree.sync() @@ -227,5 +230,9 @@ async def on_reaction_add(reaction, user): return - -client.run(TOKEN) \ No newline at end of file +if __name__ == "__main__": + if not TOKEN: + print("No token found") + exit(1) + print("Starting bot") + client.run(TOKEN) \ No newline at end of file diff --git a/faucet.py b/faucet.py index b7bdae9..d2a695f 100644 --- a/faucet.py +++ b/faucet.py @@ -13,7 +13,7 @@ async def send_domain(user, email): except EmailNotValidError as e: return "Your email is invalid" - response = requests.post("https://faucet.woodburn.au/api?email=" + email+"&name="+str(user) + "&key=" + os.getenv('FAUCET_KEY')) + response = requests.post(f"https://faucet.woodburn.au/api?email={email}&name={user}&key={os.getenv('FAUCET_KEY')}") print(response) print(response.text) response = response.json() diff --git a/shaker.py b/shaker.py index 1da133f..24d51a4 100644 --- a/shaker.py +++ b/shaker.py @@ -11,8 +11,11 @@ load_dotenv() resolver = dns.resolver.Resolver() serverIP = os.getenv('DNS_SERVER') +if not serverIP: + print("No DNS_SERVER found in .env") + exit(1) resolver.nameservers = [serverIP] -resolver.port = int(os.getenv('DNS_PORT')) +resolver.port = int(os.getenv('DNS_PORT',"53")) LOCAL = False if os.getenv('LOCAL') == "True":