Merge branch 'gonzobot' of github.com:edwardslabs/CloudBot into gonzobot

Author: A_D

data/kebab.json

@@ -0,0 +1,26 @@
+{
+  "templates": [
+    "hands {user} a delicious {kebab} with {side} and {sauce}"
+  ],
+  "parts": {
+    "kebab": [
+      "lamb doner kebab",
+      "chicken doner kebab",
+      "shawarma"
+    ],
+    "side": [
+      "salad",
+      "fries"
+    ],
+    "sauce": [
+      "garlic sauce",
+      "chili sauce",
+      "mayonnaise",
+      "ketchup",
+      "BBQ sauce",
+      "mint sauce",
+      "tzatziki sauce",
+      "no sauce"
+    ]
+  }
+}

plugins/foods.py

@@ -8,7 +8,7 @@
 from cloudbot import hook
 from cloudbot.util import textgen
 
-nick_re = re.compile("^[A-Za-z0-9_|.\-\]\[\{\}\*]*$", re.I)
+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']
@@ -68,7 +68,7 @@ def load_foods(bot):
     global sandwich_data, taco_data, coffee_data, noodles_data, muffin_data, scone_data, \
         tea_data, keto_data, beer_data, cheese_data, pancake_data, chicken_data, \
         icecream_data, brekkie_data, doobie_data, pizza_data, chocolate_data, pasta_data, \
-        nugget_data, cereal_data, pie_data, sushi_data, steak_data, milkshake_data
+        nugget_data, cereal_data, pie_data, sushi_data, steak_data, milkshake_data, kebab_data
 
     with codecs.open(os.path.join(bot.data_dir, "sandwich.json"), encoding="utf-8") as f:
         sandwich_data = json.load(f)
@@ -141,6 +141,9 @@ def load_foods(bot):
 
     with codecs.open(os.path.join(bot.data_dir, "milkshake.json"), encoding="utf-8") as f:
         milkshake_data = json.load(f)
+        
+    with codecs.open(os.path.join(bot.data_dir, "kebab.json"), encoding="utf-8") as f:
+        kebab_data = json.load(f)
 
 @asyncio.coroutine
 @hook.command
@@ -539,3 +542,17 @@ def milkshake(text, action):
 
     # act out the message
     action(generator.generate_string())
+
+@asyncio.coroutine
+@hook.command
+def kebab(text, action):
+    """<user> - give a kebab to <user>"""
+    user = text.strip()
+
+    if not is_valid(user):
+        return "I can't treat that user to a delicious kebab."
+
+    generator = textgen.TextGenerator(kebab_data["templates"], kebab_data["parts"], variables={"user": user})
+
+    # act out the message
+    action(generator.generate_string())