Merge pull request #42 from webvictim/upstream

Actually fix .grabrandom support in heralds this time

Author: edwardslabs

plugins/herald.py

@@ -3,6 +3,8 @@
 from cloudbot.event import EventType
 from plugins import grab
 
+import random
+
 db_ready = []
 
 
@@ -59,7 +61,8 @@ def welcome(nick, action, message, chan, event, db, conn):
         if greet.lower().split(' ')[0] == ".grabrandom":
             text = ""
             if len(greet.split(' ')) >= 2:
-                text = greet.lower().split(' ')[1]
+                candidates = greet.lower().split(' ')[1:]
+                text = random.choice(candidates)
             out = grab.grabrandom(text, chan, message)
             message(out, chan)
         else: