Update mcuser to have dashes in UUIDs, add limit to remind.py, remove dead code from correction. Closes #85

Author: dmptrluke

plugins/correction.py

@@ -39,5 +39,3 @@ def correction(match, conn, chan, message):
             return
         else:
             continue
-    return "Did not find {} in any recent messages.".format(to_find)
-

plugins/minecraft_user.py

@@ -1,5 +1,6 @@
 import re
 import requests
+import uuid
 
 from cloudbot import hook
 
@@ -12,46 +13,47 @@ def get_name(uuid):
     # submit the profile request
     request = requests.get(UUID_API.format(uuid))
     data = request.json()
-    return data[uuid] or None
+    return data[uuid]
 
 
 @hook.command("mcuser", "mcpaid", "haspaid")
 def mcuser(text, bot):
     """<username> - gets information about the Minecraft user <account>"""
     headers = {'User-Agent': bot.user_agent}
-    user = text.strip()
+    text = text.strip()
 
-    cleaned = user.replace('-', '')
-    if re.search(r'[0-9a-f]{32}\Z', cleaned, re.I):
+    # check if we are looking up a UUID
+    cleaned = text.replace('-', '')
+    if re.search(r'^[0-9a-f]{32}\Z$', cleaned, re.I):
+        # we are looking up a UUID, get a name.
         try:
             name = get_name(cleaned)
-        except (requests.exceptions.HTTPError, requests.exceptions.ConnectionError) as e:
+        except (requests.exceptions.HTTPError, requests.exceptions.ConnectionError, KeyError) as e:
             return "Could not get username from UUID: {}".format(e)
     else:
-        name = user
+        name = text
 
-    if not name:
-        return "The account \x02{}\x02 does not exist.".format(user)
-
-    # submit the profile request
+    # get user data from fishbans
     try:
         request = requests.get(HIST_API.format(requests.utils.quote(name)), headers=headers)
     except (requests.exceptions.HTTPError, requests.exceptions.ConnectionError) as e:
         return "Could not get profile status: {}".format(e)
 
-    # get the fishbans data
+    # read the fishbans data
     try:
         results = request.json()
     except ValueError:
         return "Could not parse profile status"
 
-    # handle errors
+    # check for errors from fishbans and handle them
     if not results['success']:
         if results['error'] == "User is not premium.":
-            return "The account \x02{}\x02 is not premium or does not exist.".format(user)
+            return "The account \x02{}\x02 is not premium or does not exist.".format(text)
         else:
             return results['error']
-    user = results["data"]
 
-    return 'The account \x02{username}\x02 ({uuid}) exists. It is a \x02paid\x02' \
-           ' account.'.format(**user)
+    username = results['data']['username']
+    id = uuid.UUID(results['data']['uuid'])
+
+    return 'The account \x02{}\x02 ({}) exists. It is a \x02paid\x02' \
+           ' account.'.format(username, id)

plugins/remind.py

@@ -52,7 +52,7 @@ def delete_reminder(async, db, network, remind_time, added_user):
 def add_reminder(async, db, network, added_user, added_chan, message, remind_time, added_time):
     query = table.insert().values(
         network=network,
-        added_user=added_user,
+        added_user=added_user.lower(),
         added_time=added_time,
         added_chan=added_chan,
         message=message,
@@ -126,6 +126,8 @@ def remind(text, nick, chan, db, conn, notice, async):
         notice(remind.__doc__)
         return
 
+    count = [x for x in reminder_cache if x[0] == conn.name and x[3] == nick.lower()].count()
+
     time_string = parts[0].strip()
     message = colors.strip_all(parts[1].strip())
 
@@ -136,7 +138,10 @@ def remind(text, nick, chan, db, conn, notice, async):
     # parse the time input, return error if invalid
     seconds = time_parse(time_string)
     if not seconds:
-        return "Invalid input"
+        return "Invalid input."
+
+    if seconds > 2764800:
+        return "I can't remind you of something more than (approximately) a month from now."
 
     # work out the time to remind the user, and check if that time is in the past
     remind_time = datetime.fromtimestamp(current_epoch + seconds)