Merge pull request #12 from SOBotics/filter_refactor --autoupdate

finished the filter refactor (not thoroughly tested)

Sources/BackgroundTasks.swift

@@ -16,12 +16,12 @@ func save(rooms: [ChatRoom]) {
 		handleError(error, "while saving the user database")
 	}
 	do {
-		try filter.saveUsernameBlacklist()
+		try filter.filterBlacklistedUsernames.saveUsernameBlacklist()
 	} catch {
 		handleError(error, "while saving the username blacklist")
 	}
 	do {
-		try filter.saveReports()
+		try filter.reports.saveReports()
 	} catch {
 		handleError(error, "while saving reports")
 	}
@@ -80,15 +80,15 @@ func handleInput(input: String, rooms: [ChatRoom], listener: ChatListener) {
 func shutDown(reason: ChatListener.StopReason, rooms: [ChatRoom]) {
 	var shouldReboot = reason == .reboot
 
-	filter.stop()
+	filter.postFetcher.stop()
 
 	//Wait for pending messages to be posted.
 	for room in rooms {
 		while !room.messageQueue.isEmpty {
 			sleep(1)
 		}
 	}
-	while filter != nil && !(filter.ws.state == .disconnected || filter.ws.state == .error) {
+	while filter != nil && !(filter.postFetcher.ws.state == .disconnected || filter.postFetcher.ws.state == .error) {
 		sleep(1)
 	}
 

Sources/CommandCheckPost.swift

@@ -38,7 +38,7 @@ class CommandCheckPost: Command {
 			reply("Could not fetch the question!")
 			return
 		}
-		let result = try filter.checkAndReportPost(question)
+		let result = try filter.postFetcher.postClassifier.checkAndReportPost(question)
 		switch result {
             case .alreadyClosed:
                 reply ("That post was caught by the filter but is already closed.")