From 858b3dbe62eaf79c44e14906b9226f9107c76779 Mon Sep 17 00:00:00 2001 From: JeDaYoshi Date: Sun, 17 Oct 2021 21:56:24 -0400 Subject: [PATCH] Make ipinfo command more similar to geoip --- modules/ip_addresses.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/ip_addresses.py b/modules/ip_addresses.py index e2cacbac..a06fecc8 100644 --- a/modules/ip_addresses.py +++ b/modules/ip_addresses.py @@ -152,10 +152,10 @@ class Module(ModuleManager.BaseModule): data = page["ip"] data += " (%s)" % hostname if hostname else "" - data += " | ISP: %s" % page["org"] - data += " | Location: %s, %s, %s" % ( - page["city"], page["region"], page["country"]) data += " (Anycast)" if page.get("anycast", False) == True else "" + data += " | City: %s" % page["city"] + data += " | Region: %s (%s)" % (page["region"], page["country"]) + data += " | ISP: %s" % page["org"] data += " | Lon/Lat: %s" % page["loc"] data += " | Timezone: %s" % page["timezone"] event["stdout"].write(data)