Switch other plugins to use the new nicks checks

Author: linuxdaemon

plugins/foods.py

@@ -51,14 +51,6 @@
 basic_food_data = defaultdict(dict)
 
 
-def is_valid(target):
-    """ Checks if a string is a valid IRC nick. """
-    if nick_re.match(target):
-        return True
-    else:
-        return False
-
-
 def load_template_data(bot, filename, data_dict):
     data_dict.clear()
     food_dir = os.path.join(bot.data_dir, "food")
@@ -95,8 +87,8 @@ def make_cmd_list(value):
 
 
 def basic_food(food):
-    def func(text, action):
-        if not is_valid(text):
+    def func(text, action, is_nick_valid):
+        if not is_nick_valid(text):
             return "I can't give {} to that user.".format(food.unitname)
 
         action(basic_format(text, basic_food_data[food.name]))

plugins/jokes.py

@@ -100,12 +100,11 @@ def boobies(text):
 
 
 @hook.command("awesome", "iscool", "cool")
-def awesome(text):
+def awesome(text, is_nick_valid):
     """- Prints a webpage to show <nick> how awesome they are."""
-    nick_re = re.compile("^[A-Za-z0-9_|.\-\]\[]*$", re.I)
     link = 'http://is-awesome.cool/{}'
     nick = text.split(' ')[0]
-    if nick_re.match(nick):
+    if is_nick_valid(nick):
         return "{}: I am blown away by your recent awesome action(s). Please read \x02{}\x02".format(
             nick, link.format(nick)
         )