From 587693f98f927b701d72ab5755c7eeb948369f36 Mon Sep 17 00:00:00 2001 From: Nathan Woodburn Date: Thu, 24 Aug 2023 14:25:58 +1000 Subject: [PATCH] bot: Added site info command --- discord-bot/bot.py | 4 +++- master/main.py | 8 ++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/discord-bot/bot.py b/discord-bot/bot.py index 89cac6a..629d691 100644 --- a/discord-bot/bot.py +++ b/discord-bot/bot.py @@ -69,13 +69,15 @@ async def createsite(ctx, domain: str, licence: str): if r.status_code == 200: json = r.json() if json['success'] == "true": - await ctx.response.send_message(f"Site {domain} creating...\nPlease send /siteinfo domain:{domain}") + await ctx.response.send_message(f"Site {domain} creating...\nPlease wait a few minutes and then send /siteinfo domain:{domain}") else: await ctx.response.send_message(f"Error creating site\n" + json['error']) else: await ctx.response.send_message(f"Error creating site\n" + r.text) + + # When the bot is ready @client.event async def on_ready(): diff --git a/master/main.py b/master/main.py index 9367bc4..edbca2b 100644 --- a/master/main.py +++ b/master/main.py @@ -203,13 +203,9 @@ def site_status(): if "tlsa" in json: tlsa = json['tlsa'] + return jsonify({'success': 'true', 'domain': domain, 'ip': ip, 'tlsa': tlsa}) else: - tlsa = "none" - - # Return status - - - return jsonify({'success': 'true', 'domain': domain, 'ip': ip, 'tlsa': tlsa}) + return jsonify({'success': 'false', 'domain': domain, 'ip': ip, 'tlsa': 'none','error': 'No TLSA record found'}) @app.route('/tlsa', methods=['GET'])