Combile modules/dns.py and modules/geoip.py in to modules/ip_addresses.py, add

!rdns command

1 files changed, 0 insertions, 31 deletions

diff --git a/modules/geoip.py b/modules/geoip.py
deleted file mode 100644
index fed27083..00000000
--- a/modules/geoip.py
+++ /dev/null
@@ -1,31 +0,0 @@
-from src import ModuleManager, utils
-
-URL_GEOIP = "http://ip-api.com/json/%s"
-
-class Module(ModuleManager.BaseModule):
-    _name = "GeoIP"
-
-    @utils.hook("received.command.geoip", min_args=1)
-    def geoip(self, event):
-        """
-        :help: Get geoip data on a given IPv4/IPv6 address
-        :usage: <IP>
-        """
-        page = utils.http.get_url(URL_GEOIP % event["args_split"][0],
-            json=True)
-        if page:
-            if page["status"] == "success":
-                data  = page["query"]
-                data += " | Organisation: %s" % page["org"]
-                data += " | City: %s" % page["city"]
-                data += " | Region: %s (%s)" % (page["regionName"],
-                    page["countryCode"])
-                data += " | ISP: %s" % page["isp"]
-                data += " | Lon/Lat: %s/%s" % (page["lon"],
-                    page["lat"])
-                data += " | Timezone: %s" % page["timezone"]
-                event["stdout"].write(data)
-            else:
-                event["stderr"].write("No geoip data found")
-        else:
-            event["stderr"].write("Failed to load results")