more little things

plugins/minecraft_items.py

@@ -42,29 +42,29 @@ with open("plugins/data/itemids.txt") as f:
         if line.startswith("//"):
             continue
         parts = line.strip().split()
-        id = parts[0]
+        itemid = parts[0]
         name = " ".join(parts[1:])
-        ids.append((id, name))
+        ids.append((itemid, name))
 
 
 @hook.command("mcid")
 @hook.command
-def mcitem(input, reply=None):
+def mcitem(inp, reply=None):
     """mcitem <item/id> -- gets the id from an item or vice versa"""
-    input = input.lower().strip()
+    inp = inp.lower().strip()
 
-    if input == "":
+    if inp == "":
         reply("error: no input.")
         return
 
     results = []
 
-    for id, name in ids:
+    for item_id, item_name in ids:
-        if input == id:
+        if inp == item_id:
-            results = ["\x02[{}]\x02 {}".format(id, name)]
+            results = ["\x02[{}]\x02 {}".format(item_id, item_name)]
             break
-        elif input in name.lower():
+        elif inp in item_name.lower():
-            results.append("\x02[{}]\x02 {}".format(id, name))
+            results.append("\x02[{}]\x02 {}".format(item_id, item_name))
 
     if not results:
         return "No matches found."
@@ -80,12 +80,12 @@ def mcitem(input, reply=None):
 
 @hook.command("mccraft")
 @hook.command
-def mcrecipe(input, reply=None):
+def mcrecipe(inp, reply=None):
     """mcrecipe <item> -- gets the crafting recipe for an item"""
-    input = input.lower().strip()
+    inp = inp.lower().strip()
 
     results = [recipe.line for recipe in recipelist
-               if input in recipe.output]
+               if inp in recipe.output]
 
     if not results:
         return "No matches found."

plugins/minecraft_ping.py

@@ -1,3 +1,4 @@
+# TODO: Rewrite this whole mess
 from util import hook
 import socket
 import struct

plugins/mlia.py

@@ -25,9 +25,9 @@ refresh_cache()
 def mlia(inp, reply=None):
     """mlia -- Gets a random quote from MyLifeIsAverage.com."""
     # grab the last item in the mlia cache and remove it
-    id, text = mlia_cache.pop()
+    mlia_id, text = mlia_cache.pop()
     # reply with the mlia we grabbed
-    reply('({}) {}'.format(id, text))
+    reply('({}) {}'.format(mlia_id, text))
     # refresh mlia cache if its getting empty
     if len(mlia_cache) < 3:
         refresh_cache()

plugins/password.py

@@ -1,4 +1,5 @@
-# based on password generation code by TheNoodle
+# TODO: Add some kind of pronounceable password generation
+# TODO: Improve randomness
 from util import hook
 import string
 import random

plugins/ping.py

@@ -13,6 +13,7 @@ def ping(inp, reply=None):
 
     if os.name == "nt":
         return "Sorry, this command is not supported on Windows systems."
+        # TODO: Rewrite this entire command to work on Windows, somehow
 
     args = inp.split(' ')
     host = args[0]

plugins/qrcode.py

@@ -8,9 +8,9 @@ def qrcode(inp):
     """qrcode [link] returns a link for a QR code."""
 
     args = {
-        "cht": "qr",  # chart type
+        "cht": "qr",  # chart type (QR)
         "chs": "200x200",  # dimensions
-        "chl": inp
+        "chl": inp  # data
     }
 
     link = http.prepare_url("http://chart.googleapis.com/chart", args)