From 08e3cd3c13466c2e460aec110214b584e722cb0d Mon Sep 17 00:00:00 2001
From: Luke Rogers <lukeroge@gmail.com>
Date: Wed, 13 Feb 2013 17:37:57 +1300
Subject: [PATCH] Changed

---
 plugins/fishbans.py | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/plugins/fishbans.py b/plugins/fishbans.py
index 12ce47b..72f3b5a 100644
--- a/plugins/fishbans.py
+++ b/plugins/fishbans.py
@@ -1,55 +1,56 @@
 from util import hook, http
 from urllib import quote_plus
 
-api_url = "http://www.fishbans.com/api/stats/%s/force/"
+api_url = "http://api.fishbans.com/stats/{}/"
 
 
 @hook.command("bans")
 @hook.command
 def fishbans(inp):
     "fishbans <user> -- Gets information on <user>s minecraft bans from fishbans"
-    user = inp
+    user = inp.strip()
 
     try:
-        request = http.get_json(api_url % quote_plus(user))
+        request = http.get_json(api_url.format(quote_plus(user)))
     except (http.HTTPError, http.URLError) as e:
         return "Could not fetch ban data from the Fishbans API: {}".format(e)
 
     if request["success"] == False:
-        return "Could not fetch ban data for %s." % user
+        return "Could not fetch ban data for {}.".format(user)
 
-    user_url = "http://fishbans.com/u/%s" % user
+    user_url = "http://fishbans.com/u/{}/".format(user)
     ban_count = request["stats"]["totalbans"]
 
-    return "The user \x02%s\x02 has \x02%s\x02 ban(s). See detailed info " \
-           "at %s" % (user, ban_count, user_url)
+    return "The user \x02{}\x02 has \x02{}\x02 ban(s). See detailed info " \
+           "at {}".format(user, ban_count, user_url)
 
 
 @hook.command
 def bancount(inp):
     "bancount <user> -- Gets a count of <user>s minecraft bans from fishbans"
-    user = inp
+    user = inp.strip()
 
     try:
-        request = http.get_json(api_url % quote_plus(user))
+        request = http.get_json(api_url.format(quote_plus(user)))
     except (http.HTTPError, http.URLError) as e:
         return "Could not fetch ban data from the Fishbans API: {}".format(e)
 
     if request["success"] == False:
-        return "Could not fetch ban data for %s." % user
+        return "Could not fetch ban data for {}.".format(user)
 
-    user_url = "http://fishbans.com/u/%s" % user
+    user_url = "http://fishbans.com/u/{}/".format(user)
     services = request["stats"]["service"]
 
     out = []
     for service, ban_count in services.items():
         if ban_count != 0:
-            out.append("%s: \x02%s\x02" % (service, ban_count))
+            out.append("{}: \x02{}\x02".format(service, ban_count))
         else:
             pass
 
     if not out:
-        return "The user \x02%s\x02 has no bans." % user
+        return "The user \x02{}\x02 has no bans.".format(user)
     else:
-        text = "Bans for \x02%s\x02: " % user
-        return text + ", ".join(out)
+        # dat string.
+        return "Bans for \x02{}\x02: ".format(user) + ", ".join(out) + ". More info " \
+               "at {}".format(user_url)