Merge foods and newfoods, tidy code, fix remind.py

Author: dmptrluke

plugins/attacks.py

@@ -8,13 +8,31 @@
 from cloudbot import hook
 from cloudbot.util import textgen
 
+nick_re = re.compile("^[A-Za-z0-9_|.-\]\[]*$", re.I)
+
+
+def is_valid(target):
+    """ Checks if a string is a valid IRC nick. """
+    if nick_re.match(target):
+        return True
+    else:
+        return False
+
+
+def is_self(conn, target):
+    """ Checks if a string is "****self" or contains conn.name. """
+    if re.search("(^..?.?.?self|{})".format(re.escape(conn.nick)), target, re.I):
+        return True
+    else:
+        return False
+
 
 @hook.on_start()
 def load_attacks(bot):
     """
     :type bot: cloudbot.bot.CloudBot
     """
-    global larts, insults, flirts, kills, slaps
+    global larts, flirts, kills, slaps
 
     with codecs.open(os.path.join(bot.data_dir, "larts.txt"), encoding="utf-8") as f:
         larts = [line.strip() for line in f.readlines() if not line.startswith("//")]
@@ -29,33 +47,17 @@ def load_attacks(bot):
         slaps = json.load(f)
 
 
-def is_self(conn, target):
-    """
-    :type conn: cloudbot.client.Client
-    :type target: str
-    """
-    if re.search("(^..?.?.?self|{})".format(re.escape(conn.nick.lower())), target.lower()):
-        return True
-    else:
-        return False
-
-
 @asyncio.coroutine
-@hook.command()
-def lart(text, conn, nick, notice, action):
-    """<user> - LARTs <user>
-    :type text: str
-    :type conn: cloudbot.client.Client
-    :type nick: str
-    """
+@hook.command
+def lart(text, conn, nick, action):
+    """<user> - LARTs <user>"""
     target = text.strip()
 
-    if " " in target:
-        notice("Invalid username!")
-        return
+    if not is_valid(target):
+        return "I can't attack that."
 
-    # if the user is trying to make the bot target itself, target them
     if is_self(conn, target):
+        # user is trying to make the bot attack itself!
         target = nick
 
     phrase = random.choice(larts)
@@ -65,42 +67,32 @@ def lart(text, conn, nick, notice, action):
 
 
 @asyncio.coroutine
-@hook.command()
-def flirt(text, conn, nick, notice, message):
-    """<user> - flirts with <user>
-    :type text: str
-    :type conn: cloudbot.client.Client
-    :type nick: str
-    """
+@hook.command
+def flirt(text, conn, nick, message):
+    """<user> - flirts with <user>"""
     target = text.strip()
 
-    # if the user is trying to make the bot target itself, target them
-    if " " in target:
-        notice("Invalid username!")
-        return
+    if not is_valid(target):
+        return "I can't attack that."
 
     if is_self(conn, target):
+        # user is trying to make the bot attack itself!
         target = nick
 
     message('{}, {}'.format(target, random.choice(flirts)))
 
 
 @asyncio.coroutine
-@hook.command()
-def kill(text, conn, nick, notice, action):
-    """<user> - kills <user>
-    :type text: str
-    :type conn: cloudbot.client.Client
-    :type nick: str
-    """
+@hook.command
+def kill(text, conn, nick, action):
+    """<user> - kills <user>"""
     target = text.strip()
 
-    if " " in target:
-        notice("Invalid username!")
-        return
+    if not is_valid(target):
+        return "I can't attack that."
 
-    # if the user is trying to make the bot kill itself, kill them
     if is_self(conn, target):
+        # user is trying to make the bot attack itself!
         target = nick
 
     generator = textgen.TextGenerator(kills["templates"], kills["parts"], variables={"user": target})
@@ -109,17 +101,17 @@ def kill(text, conn, nick, notice, action):
     action(generator.generate_string())
 
 
+@asyncio.coroutine
 @hook.command
 def slap(text, action, nick, conn, notice):
-    """slap <user> -- Makes the bot slap <user>."""
+    """<user> -- Makes the bot slap <user>."""
     target = text.strip()
 
-    if " " in target:
-        notice("Invalid username!")
-        return
+    if not is_valid(target):
+        return "I can't attack that."
 
-    # if the user is trying to make the bot slap itself, slap them
-    if target.lower() == conn.nick.lower() or target.lower() == "itself":
+    if is_self(conn, target):
+        # user is trying to make the bot attack itself!
         target = nick
 
     variables = {

plugins/foods.py

@@ -1,8 +1,14 @@
-import re
-import asyncio
+import codecs
+import json
+import os
 import random
+import asyncio
+import re
 
 from cloudbot import hook
+from cloudbot.util import textgen
+
+nick_re = re.compile("^[A-Za-z0-9_|.-\]\[]*$", re.I)
 
 cakes = ['Chocolate', 'Ice Cream', 'Angel', 'Boston Cream', 'Birthday', 'Bundt', 'Carrot', 'Coffee', 'Devils', 'Fruit',
          'Gingerbread', 'Pound', 'Red Velvet', 'Stack', 'Welsh', 'Yokan']
@@ -47,33 +53,51 @@
             'Yukon Gold']
 
 
+def is_valid(target):
+    """ Checks if a string is a valid IRC nick. """
+    if nick_re.match(target):
+        return True
+    else:
+        return False
+
+@hook.on_start()
+def load_foods(bot):
+    """
+    :type bot: cloudbot.bot.CloudBot
+    """
+    global sandwich_data
+
+    with codecs.open(os.path.join(bot.data_dir, "sandwich.json"), encoding="utf-8") as f:
+        sandwich_data = json.load(f)
+
+
 @asyncio.coroutine
-@hook.command()
+@hook.command
 def potato(text, action):
     """<user> - makes <user> a tasty little potato"""
-    text = text.strip()
+    user = text.strip()
 
-    if not re.match("^[A-Za-z0-9_|.-\]\[]*$", text.lower()):
-        return "I cant make a tasty potato for that user!"
+    if not is_valid(user):
+        return "I can't give a potato to that user."
 
     potato_type = random.choice(potatoes)
     size = random.choice(['small', 'little', 'mid-sized', 'medium-sized', 'large', 'gigantic'])
     flavor = random.choice(['tasty', 'delectable', 'delicious', 'yummy', 'toothsome', 'scrumptious', 'luscious'])
     method = random.choice(['bakes', 'fries', 'boils', 'roasts'])
     side_dish = random.choice(['side salad', 'dollop of sour cream', 'piece of chicken', 'bowl of shredded bacon'])
 
-    action("{} a {} {} {} potato for {} and serves it with a small {}!".format(method, flavor, size, potato_type, text,
+    action("{} a {} {} {} potato for {} and serves it with a small {}!".format(method, flavor, size, potato_type, user,
                                                                                side_dish))
 
 
 @asyncio.coroutine
-@hook.command()
+@hook.command
 def cake(text, action):
     """<user> - gives <user> an awesome cake"""
-    text = text.strip()
+    user = text.strip()
 
-    if not re.match("^[A-Za-z0-9_|.-\]\[]*$", text.lower()):
-        return "I can't give an awesome cake to that user!"
+    if not is_valid(user):
+        return "I can't give a cake to that user."
 
     cake_type = random.choice(cakes)
     size = random.choice(['small', 'little', 'mid-sized', 'medium-sized', 'large', 'gigantic'])
@@ -82,24 +106,40 @@ def cake(text, action):
     side_dish = random.choice(['glass of chocolate milk', 'bowl of ice cream', 'jar of cookies',
                                'some chocolate sauce'])
 
-    action("{} {} a {} {} {} cake and serves it with a small {}!".format(method, text, flavor, size, cake_type,
+    action("{} {} a {} {} {} cake and serves it with a small {}!".format(method, user, flavor, size, cake_type,
                                                                          side_dish))
 
 
 @asyncio.coroutine
-@hook.command()
+@hook.command
 def cookie(text, action):
     """<user> - gives <user> a cookie"""
-    text = text.strip()
+    user = text.strip()
 
-    if not re.match("^[A-Za-z0-9_|.-\]\[]*$", text.lower()):
-        return "I can't give a cookie to that user!"
+    if not is_valid(user):
+        return "I can't give a cookie to that user."
 
     cookie_type = random.choice(cookies)
     size = random.choice(['small', 'little', 'medium-sized', 'large', 'gigantic'])
     flavor = random.choice(['tasty', 'delectable', 'delicious', 'yummy', 'toothsome', 'scrumptious', 'luscious'])
     method = random.choice(['makes', 'gives', 'gets', 'buys'])
     side_dish = random.choice(['glass of milk', 'bowl of ice cream', 'bowl of chocolate sauce'])
 
-    action("{} {} a {} {} {} cookie and serves it with a {}!".format(method, text, flavor, size, cookie_type,
+    action("{} {} a {} {} {} cookie and serves it with a {}!".format(method, user, flavor, size, cookie_type,
                                                                      side_dish))
+
+
+@asyncio.coroutine
+@hook.command
+def sandwich(text, action):
+    """<user> - give a tasty sandwich to <user>"""
+    user = text.strip()
+
+    if not is_valid(user):
+        return "I can't give a cookie to that user."
+
+    generator = textgen.TextGenerator(sandwich_data["templates"], sandwich_data["parts"],
+                                      variables={"user": user})
+
+    # act out the message
+    action(generator.generate_string())

plugins/newfoods.py

@@ -126,7 +126,7 @@ 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()
+    count = len([x for x in reminder_cache if x[0] == conn.name and x[3] == nick.lower()])
 
     time_string = parts[0].strip()
     message = colors.strip_all(parts[1].strip())