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

Author: edwardslabs

data/rice.json

@@ -0,0 +1,27 @@
+{
+  "templates": [
+    "hands {user} a bowl of {rice} rice."
+  ],
+  "parts": {
+    "rice": [
+        "Uncle Ben's Basmati",
+        "Uncle Ben's Golden Vegetable ",
+        "Japanese Koshihikari",
+        "Camargue red",
+        "Brown",
+        "Wehani",
+        "Jasmine",
+        "Sticky",
+        "Hokkien fried",
+        "Bibimbap",
+        "Dal bhat",
+        "Onigiri",
+        "Long-grain Nychaki",
+        "Iranian Domsiah",
+        "Italian Vialone Nano",
+        "Nàng Thơm Chợ Đào",
+        "Htamanè",
+        "Aromic Tulaipanji"
+    ]
+  }
+}

plugins/foods.py

@@ -65,7 +65,7 @@ def load_foods(bot):
     """
     :type bot: cloudbot.bot.CloudBot
     """
-    global sandwich_data, taco_data, coffee_data, noodles_data, muffin_data, scone_data, \
+    global sandwich_data, taco_data, coffee_data, noodles_data, muffin_data, scone_data, rice_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, kebab_data
@@ -88,6 +88,9 @@ def load_foods(bot):
     with codecs.open(os.path.join(bot.data_dir, "scone.json"), encoding="utf-8") as f:
         scone_data = json.load(f)
 
+    with codecs.open(os.path.join(bot.data_dir, "rice.json"), encoding="utf-8") as f:
+        rice_data = json.load(f)
+
     with codecs.open(os.path.join(bot.data_dir, "tea.json"), encoding="utf-8") as f:
         tea_data = json.load(f)
 
@@ -291,6 +294,20 @@ def scone(text, action):
     # act out the message
     action(generator.generate_string())
 
+@asyncio.coroutine
+@hook.command
+def rice(text, action):
+    """<user> - give rice to <user>"""
+    user = text.strip()
+
+    if not is_valid(user):
+        return "I can't give rice to that user."
+
+    generator = textgen.TextGenerator(rice_data["templates"], rice_data["parts"],
+                                      variables={"user": user})
+    # act out the message
+    action(generator.generate_string())
+
 @asyncio.coroutine
 @hook.command
 def tea(text, action):

plugins/link_announcer.py

@@ -5,7 +5,7 @@
 from cloudbot import hook
 
 # This will match any URL except the patterns defined in blacklist.
-blacklist = '.*(reddit\.com|redd\.it|youtube\.com|youtu\.be|imdb\.com|spotify\.com|twitter\.com|twitch\.tv|amazon\.co|xkcd\.com|amzn\.co|steamcommunity\.com|steampowered\.com|newegg\.com|soundcloud\.com|vimeo\.com).*'
+blacklist = '.*(reddit\.com|redd\.it|youtube\.com|youtu\.be|imdb\.com|spotify\.com|twitter\.com|twitch\.tv|amazon\.co|xkcd\.com|amzn\.co|steamcommunity\.com|steampowered\.com|newegg\.com|soundcloud\.com|vimeo\.com|speedtest\.net).*'
 url_re = re.compile('(?!{})http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@.&+~]|[!*\(\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+'.format(blacklist), re.I)
 
 opt_out = []