Replace existing nick parsing regexes with calls to is_nick_valid()

Author: linuxdaemon

plugins/core/core_tracker.py

@@ -2,15 +2,12 @@
 
 import asyncio
 import logging
-import re
 from collections import deque
 
 from cloudbot import hook
 
 logger = logging.getLogger("cloudbot")
 
-nick_re = re.compile(":(.+?)!")
-
 
 # functions called for bot state tracking
 
@@ -36,7 +33,6 @@ def on_kick(conn, chan, target, loop):
     """
     :type conn: cloudbot.client.Client
     :type chan: str
-    :type nick: str
     """
     # if the bot has been kicked, remove from the channel list
     if target == conn.nick:
@@ -49,13 +45,13 @@ def on_kick(conn, chan, target, loop):
 
 @asyncio.coroutine
 @hook.irc_raw("NICK")
-def on_nick(irc_paramlist, conn, irc_raw):
+def on_nick(irc_paramlist, conn, nick):
     """
     :type irc_paramlist: list[str]
     :type conn: cloudbot.client.Client
-    :type irc_raw: str
+    :type nick: str
     """
-    old_nick = nick_re.search(irc_raw).group(1)
+    old_nick = nick
     new_nick = str(irc_paramlist[0])
 
     # get rid of :

plugins/history.py

@@ -1,13 +1,13 @@
-from collections import deque
-import time
 import asyncio
 import re
+import time
+from collections import deque
 
 from sqlalchemy import Table, Column, String, PrimaryKeyConstraint
 
 from cloudbot import hook
-from cloudbot.util import timeformat, database
 from cloudbot.event import EventType
+from cloudbot.util import timeformat, database
 
 table = Table(
     'seen_user',
@@ -83,7 +83,7 @@ def resethistory(event, conn):
 
 
 @hook.command()
-def seen(text, nick, chan, db, event):
+def seen(text, nick, chan, db, event, is_valid_nick):
     """<nick> <channel> - tells when a nickname was last in active in one of my channels
     :type db: sqlalchemy.orm.Session
     :type event: cloudbot.event.Event
@@ -96,14 +96,14 @@ def seen(text, nick, chan, db, event):
     if text.lower() == nick.lower():
         return "Have you looked in a mirror lately?"
 
-    if not re.match("^[A-Za-z0-9_|\^\*\`.\-\]\[\{\}\\\\]*$", text.lower()):
+    if not is_valid_nick(text):
         return "I can't look up that name, its impossible to use!"
 
     if '_' in text:
         text = text.replace("_", "/_")
 
-    last_seen = db.execute("select name, time, quote from seen_user where name like :name escape '/' and chan = :chan",
-                            {'name': text, 'chan': chan}).fetchone()
+    last_seen = db.execute("SELECT name, time, quote FROM seen_user WHERE name LIKE :name ESCAPE '/' AND chan = :chan",
+                           {'name': text, 'chan': chan}).fetchone()
 
     text = text.replace("/", "")