.BANCHO. .FIX. Fix chat filters

helpers/chatHelper.py

@@ -6,9 +6,7 @@ from objects import fokabot
 from helpers import discordBotHelper
 from helpers import userHelper
 from events import logoutEvent
-from events import channelJoinEvent
 from constants import messageTemplates
-from helpers import filterHelper
 
 def joinChannel(userID = 0, channel = "", token = None, toIRC = True):
 	"""
@@ -210,9 +208,8 @@ def sendMessage(fro = "", to = "", message = "", token = None, toIRC = True):
 		# Truncate message if > 2048 characters
 		message = message[:2048]+"..." if len(message) > 2048 else message
 
-		# check for word filters
-		filters = filterHelper.chatFilters()
-		message = filters.checkFilters(message)
+		# Check for word filters
+		message = glob.chatFilters.filterMessage(message)
 
 		# Build packet bytes
 		packet = serverPackets.sendMessage(username, toClient, message)

helpers/filterHelper.py

@@ -1,31 +0,0 @@
-import os
-
-class chatFilters():
-	oldWords = () # have to use tuples as a
-	newWords = () # dictionary broke fairly hard.
-
-	def loadFilters(self):
-		filterFile = open(os.path.dirname(os.path.realpath(__file__)) + "/filters.txt", "r")
-
-		for line in filterFile:
-
-			lineSplit = line.split("=")
-
-			#self.filters[lineSplit[0]] = lineSplit[1]
-			self.oldWords += (lineSplit[0],)
-			self.newWords += (lineSplit[1].replace("\n", ""),)
-
-
-	def checkFilters(self, message):
-		if " " in message:
-			messageTemp = message.split(" ") # split word by spaces
-		else:
-			messageTemp = message
-
-		for word in messageTemp:
-			if word in self.oldWords:
-				oldIdx = self.oldWords.index(word)
-
-				message = message.replace(word, self.newWords[oldIdx]) # replace the bad word with our filtered word
-
-		return message