From b6eaf210fe334caa566cabdc3071b5a26e6bbbf9 Mon Sep 17 00:00:00 2001
From: Riley Davis <riley.davis@gmail.com>
Date: Mon, 9 Jan 2017 15:41:47 -0700
Subject: [PATCH] don't use regex on existing lists

---
 models/user.js       | 2 --
 services/wordlist.js | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/models/user.js b/models/user.js
index a25bca092..a0993c55a 100644
--- a/models/user.js
+++ b/models/user.js
@@ -342,7 +342,6 @@ const isValidDisplayName = (displayName) => {
 UserService.createLocalUser = (email, password, displayName) => {
 
   if (!email) {
-
     return Promise.reject(errors.ErrMissingEmail);
   }
 
@@ -350,7 +349,6 @@ UserService.createLocalUser = (email, password, displayName) => {
   displayName = displayName.toLowerCase().trim();
 
   if (!password) {
-
     return Promise.reject(errors.ErrMissingPassword);
   }
 
diff --git a/services/wordlist.js b/services/wordlist.js
index bf5c3d7cf..e912abc43 100644
--- a/services/wordlist.js
+++ b/services/wordlist.js
@@ -176,8 +176,8 @@ class Wordlist {
         displayName = displayName.replace(/_/g, '');
 
         // test each word, and fail if we find a match
-        const hasBadWords = wl.lists.banned.some(word => {
-          return new RegExp(word, 'ig').test(displayName);
+        const hasBadWords = wl.lists.banned.some(phrase => {
+          return displayName.indexOf(phrase.join('')) !== -1;
         });
 
         if (hasBadWords) {