From 369ddbe9399053a1ccf8499c7bf3f599b7a226cf Mon Sep 17 00:00:00 2001
From: Mark Veidemanis <m@zm.is>
Date: Wed, 14 Mar 2018 20:20:53 +0000
Subject: [PATCH] Additional checks on keyword matches to prevent errors when
 no part message is specified

---
 conf/keyword.json  | 7 -------
 modules/keyword.py | 4 ++++
 2 files changed, 4 insertions(+), 7 deletions(-)
 delete mode 100644 conf/keyword.json

diff --git a/conf/keyword.json b/conf/keyword.json
deleted file mode 100644
index b5e497e..0000000
--- a/conf/keyword.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "Keywords": [
-        "example",
-        "s"
-    ],
-    "KeywordsExcept": {}
-}
\ No newline at end of file
diff --git a/modules/keyword.py b/modules/keyword.py
index 83205a6..36e9f9b 100644
--- a/modules/keyword.py
+++ b/modules/keyword.py
@@ -35,6 +35,8 @@ def sendMaster(data):
         main.connections[i].send(data)
 
 def isKeyword(msg):
+    if msg == None:
+        return
     message = msg.lower()
     messageDuplicate = message
     toUndo = False
@@ -67,6 +69,8 @@ def isKeyword(msg):
         return [message, uniqueNum, totalNum]
 
 def actKeyword(user, channel, message, nickname, actType, name):
+    if message == None:
+        return
     toSend = isKeyword(message)
     if name == main.config["Master"][0] and channel == main.config["Master"][1]:
         pass