Merge pull request CloudBotIRC#153 from linuxdaemon/gonzobot+fix-badwords

Clean up and fix errors in badwords.py

Author: edwardslabs

plugins/badwords.py

@@ -1,6 +1,7 @@
 import re
+from collections import defaultdict
 
-from sqlalchemy import Table, Column, String, PrimaryKeyConstraint
+from sqlalchemy import Table, Column, String, PrimaryKeyConstraint, select
 
 from cloudbot import hook
 from cloudbot.event import EventType
@@ -15,104 +16,87 @@
     PrimaryKeyConstraint('word', 'chan')
 )
 
+badcache = defaultdict(list)
+
 
 @hook.on_start()
 @hook.command("loadbad", permissions=["badwords"], autohelp=False)
 def load_bad(db):
     """- Should run on start of bot to load the existing words into the regex"""
-    global badword_re, blacklist, black_re
-    words = db.execute("select word from badwords").fetchall()
-    out = ""
-    for word in words:
-        out += "{}|".format(word[0])
-    blacklist = out[:-1]
-    black_re = '(\s|^|[^\w\s])({0})(\s|$|[^\w\s])'.format(blacklist)
-    badword_re = re.compile(black_re, re.IGNORECASE)
+    global badword_re
+    badcache.clear()
+    words = []
+    for chan, word in db.execute(select([table.c.chan, table.c.word])):
+        badcache[chan.casefold()].append(word)
+        words.append(word)
+
+    badword_re = re.compile(
+        r'(\s|^|[^\w\s])({0})(\s|$|[^\w\s])'.format('|'.join(words)), re.IGNORECASE
+    )
 
 
 @hook.command("addbad", permissions=["badwords"])
-def add_bad(text, nick, db, conn):
+def add_bad(text, nick, db):
     """<word> <channel> - adds a bad word to the auto kick list must specify a channel with each word"""
-    global blacklist, black_re, blacklist
-    word = text.split(' ')[0].lower()
-    channel = text.split(' ')[1].lower()
+    splt = text.lower().split(None, 1)
+    word, channel = splt
     if not channel.startswith('#'):
         return "Please specify a valid channel name after the bad word."
+
     word = re.escape(word)
-    wordlist = list_bad(channel, db, conn)
+    wordlist = list_bad(channel)
     if word in wordlist:
         return "{} is already added to the bad word list for {}".format(
-            word,
-            channel)
-    else:
-        if len(
-            db.execute(
-                "select word from badwords where chan = :chan", {
-                    "chan": channel}).fetchall()) < 10:
-            db.execute(
-                "insert into badwords ( word, nick, chan ) values ( :word, :nick, :chan)", {
-                    "word": word, "nick": nick, "chan": channel})
-            db.commit()
-            load_bad(db, conn)
-            wordlist = list_bad(channel, db, conn)
-            return "Current badwords: {}".format(wordlist)
-        else:
-            return "There are too many words listed for channel {}. Please remove a word using .rmbad before adding anymore. For a list of bad words use .listbad".format(
-                channel)
+            word, channel
+        )
+
+    if len(badcache[channel]) >= 10:
+        return "There are too many words listed for channel {}. Please remove a word using .rmbad before adding anymore. For a list of bad words use .listbad".format(
+            channel
+        )
+
+    db.execute(table.insert().values(word=word, nick=nick, chan=channel))
+    db.commit()
+    load_bad(db)
+    wordlist = list_bad(channel)
+    return "Current badwords: {}".format(wordlist)
 
 
 @hook.command("rmbad", "delbad", permissions=["badwords"])
-def del_bad(text, db, conn):
+def del_bad(text, db):
     """<word> <channel> - removes the specified word from the specified channels bad word list"""
-    global blacklist, black_re, blacklist
-    word = text.split(' ')[0].lower()
-    if not (text.split(' ')[1] or text.split(' ')[1]('#')):
-        return "please specify a valid channel name"
-    channel = text.split(' ')[1].lower()
-    db.execute(
-        "delete from badwords where word = :word and chan = :chan", {
-            "word": word, "chan": channel})
+    splt = text.lower().split(None, 1)
+    word, channel = splt
+    if not channel.startswith('#'):
+        return "Please specify a valid channel name after the bad word."
+
+    db.execute(table.delete().where(table.c.word == word).where(table.c.chan == channel))
     db.commit()
-    newlist = list_bad(channel, db, conn)
-    load_bad(db, conn)
+    newlist = list_bad(channel)
+    load_bad(db)
     return "Removing {} new bad word list for {} is: {}".format(
-        word,
-        channel,
-        newlist)
+        word, channel, newlist
+    )
 
 
 @hook.command("listbad", permissions=["badwords"])
-def list_bad(text, db):
+def list_bad(text):
     """<channel> - Returns a list of bad words specify a channel to see words for a particular channel"""
     text = text.split(' ')[0].lower()
-    out = ""
     if not text.startswith('#'):
         return "Please specify a valid channel name"
-    words = db.execute(
-        "select word from badwords where chan = :chan", {
-            "chan": text}).fetchall()
-    for word in words:
-        out += "{}|".format(word[0])
-    return out[:-1]
+
+    return '|'.join(badcache[text])
 
 
 @hook.event([EventType.message, EventType.action], singlethread=True)
-def test_badwords(event, db, conn, message):
-    match = re.search(black_re, event.content, re.IGNORECASE)
-    if match:
-        # Check to see if the match is for this channel
-        word = match.group().lower().strip()
-        check = db.execute(
-            "select word, nick from badwords where word = :word and chan = :chan", {
-                "word": word, "chan": event.chan}).fetchone()
-        if (check) or ((word == "fap") and (event.chan == "#conversations")):
-            out = "KICK {} {} :that fucking word is so damn offensive".format(
-                event.chan,
-                event.nick)
-            message(
-                "{}, congratulations you've won!".format(
-                    event.nick),
-                event.chan)
-            conn.send(out)
-        else:
-            pass
+def test_badwords(conn, message, chan, content, nick):
+    match = badword_re.match(content)
+    if not match:
+        return
+
+    # Check to see if the match is for this channel
+    word = match.group().lower().strip()
+    if word in badcache[chan]:
+        conn.cmd("KICK", chan, nick, "that fucking word is so damn offensive")
+        message("{}, congratulations you've won!".format(nick))