From 716cd0578fca8508aa51533a8eda99ddcf3bfdfd Mon Sep 17 00:00:00 2001
From: Guangcong Luo <guangcongluo@gmail.com>
Date: Wed, 16 Jul 2014 23:39:51 -0400
Subject: [PATCH] Remove bannedwords feature

Username word bans are now implemented in the lobby server
---
 .gitignore |  1 -
 users.js   | 37 -------------------------------------
 2 files changed, 38 deletions(-)

diff --git a/.gitignore b/.gitignore
index b7e822de54..8ef23ee5ec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,6 @@
 /logs/*
 /node_modules
 npm-debug.log
-/config/bannedwords.txt
 
 # boilerplate #
 ###############
diff --git a/users.js b/users.js
index 56b106d59a..86a5e0748b 100644
--- a/users.js
+++ b/users.js
@@ -268,38 +268,7 @@ Users.setOfflineGroup = function (name, group, force) {
 	return true;
 };
 
-/*********************************************************
- * Banned words
- *********************************************************/
-
-var bannedWords = {};
-function importBannedWords() {
-	fs.readFile('config/bannedwords.txt', function (err, data) {
-		if (err) return;
-		data = ('' + data).split("\n");
-		bannedWords = {};
-		for (var i = 0; i < data.length; i++) {
-			if (!data[i]) continue;
-			bannedWords[data[i]] = true;
-		}
-	});
-}
-function exportBannedWords() {
-	fs.writeFile('config/bannedwords.txt', Object.keys(bannedWords).join('\n'));
-}
-function addBannedWord(word) {
-	bannedWords[word] = true;
-	exportBannedWords();
-}
-function removeBannedWord(word) {
-	delete bannedWords[word];
-	exportBannedWords();
-}
-importBannedWords();
-
 Users.importUsergroups = importUsergroups;
-Users.addBannedWord = addBannedWord;
-Users.removeBannedWord = removeBannedWord;
 
 /*********************************************************
  * User and Connection classes
@@ -652,12 +621,6 @@ var User = (function () {
 			this.send('|nametaken|' + "|You did not specify a name.");
 			return false;
 		} else {
-			for (var w in bannedWords) {
-				if (userid.indexOf(w) >= 0) {
-					this.send('|nametaken|' + "|That name contains a banned word or phrase.");
-					return false;
-				}
-			}
 			if (userid === this.userid && !auth) {
 				return this.forceRename(name, this.authenticated, this.forceRenamed);
 			}