From 1106b5842c5a0a7f05d06ece0e27f792f584a598 Mon Sep 17 00:00:00 2001 From: jesopo Date: Tue, 16 Jul 2019 16:52:41 +0100 Subject: [PATCH] allow @ arg to be anywhere in !dns command --- modules/ip_addresses.py | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/modules/ip_addresses.py b/modules/ip_addresses.py index 17f3fdf6..af12330d 100644 --- a/modules/ip_addresses.py +++ b/modules/ip_addresses.py @@ -25,18 +25,16 @@ class Module(ModuleManager.BaseModule): :usage: [type [type ...]] :prefix: DNS """ - hostname = event["args_split"][0] - + args = event["args_split"][:] nameserver = event["server"].get_setting("dns-nameserver", None) + for i, arg in enumerate(args): + if arg[0] == "@": + nameserver = args.pop(i)[1:] + break - record_types = [] - if len(event["args_split"]) > 1: - for arg in event["args_split"][1:]: - if arg.startswith("@"): - nameserver = arg[1:] - else: - record_types.append(arg.upper()) + hostname = args[0] + record_types = args[1:] if not record_types: record_types = ["A?", "AAAA?"]