From 38acd4db1cffb484f665ba62a9fda3596274d429 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= <kasper@kasperrt.no>
Date: Thu, 7 Jun 2018 12:00:05 +0200
Subject: [PATCH] Re-enabled filter for badwords

---
 server/handlers/chat.js          | 6 +++---
 server/handlers/io.js            | 6 +++---
 server/handlers/list.js          | 6 +++---
 server/handlers/list_change.js   | 6 +++---
 server/handlers/list_settings.js | 6 +++---
 server/routing/client/api.js     | 4 +++-
 6 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/server/handlers/chat.js b/server/handlers/chat.js
index 409488c8..50d5afab 100644
--- a/server/handlers/chat.js
+++ b/server/handlers/chat.js
@@ -1,12 +1,12 @@
 var Functions = require(pathThumbnails + '/handlers/functions.js');
 var crypto = require('crypto');
 var Filter = require('bad-words');
-//var filter = new Filter({ placeHolder: 'x'});
-var filter = {
+var filter = new Filter({ placeHolder: 'x'});
+/*var filter = {
     clean: function(str) {
         return str;
     }
-}
+}*/
 var db = require(pathThumbnails + '/handlers/db.js');
 
 function get_history(channel, all, socket) {
diff --git a/server/handlers/io.js b/server/handlers/io.js
index ed2a3166..a8c880e0 100644
--- a/server/handlers/io.js
+++ b/server/handlers/io.js
@@ -11,12 +11,12 @@ var Frontpage = require(pathThumbnails + '/handlers/frontpage.js');
 var Search = require(pathThumbnails + '/handlers/search.js');
 var crypto = require('crypto');
 var Filter = require('bad-words');
-//var filter = new Filter({ placeHolder: 'x'});
-var filter = {
+var filter = new Filter({ placeHolder: 'x'});
+/*var filter = {
     clean: function(str) {
         return str;
     }
-}
+}*/
 var db = require(pathThumbnails + '/handlers/db.js');
 
 module.exports = function() {
diff --git a/server/handlers/list.js b/server/handlers/list.js
index 170a9820..9370a5b4 100644
--- a/server/handlers/list.js
+++ b/server/handlers/list.js
@@ -4,12 +4,12 @@ var Functions = require(pathThumbnails + '/handlers/functions.js');
 var Frontpage = require(pathThumbnails + '/handlers/frontpage.js');
 var crypto = require('crypto');
 var Filter = require('bad-words');
-//var filter = new Filter({ placeHolder: 'x'});
-var filter = {
+var filter = new Filter({ placeHolder: 'x'});
+/*var filter = {
     clean: function(str) {
         return str;
     }
-}
+}*/
 var request = require('request');
 var db = require(pathThumbnails + '/handlers/db.js');
 
diff --git a/server/handlers/list_change.js b/server/handlers/list_change.js
index d204bdd9..452eaa89 100644
--- a/server/handlers/list_change.js
+++ b/server/handlers/list_change.js
@@ -4,12 +4,12 @@ var Frontpage = require(pathThumbnails + '/handlers/frontpage.js');
 var Search = require(pathThumbnails + '/handlers/search.js');
 var crypto = require('crypto');
 var Filter = require('bad-words');
-//var filter = new Filter({ placeHolder: 'x'});
-var filter = {
+var filter = new Filter({ placeHolder: 'x'});
+/*var filter = {
     clean: function(str) {
         return str;
     }
-}
+}*/
 var db = require(pathThumbnails + '/handlers/db.js');
 
 function addFromOtherList(arr, guid, offline, socket) {
diff --git a/server/handlers/list_settings.js b/server/handlers/list_settings.js
index 8b4fd324..deaacb75 100644
--- a/server/handlers/list_settings.js
+++ b/server/handlers/list_settings.js
@@ -1,12 +1,12 @@
 var Functions = require(pathThumbnails + '/handlers/functions.js');
 var crypto = require('crypto');
 var Filter = require('bad-words');
-//var filter = new Filter({ placeHolder: 'x'});
-var filter = {
+var filter = new Filter({ placeHolder: 'x'});
+/*var filter = {
     clean: function(str) {
         return str;
     }
-}
+}*/
 var db = require(pathThumbnails + '/handlers/db.js');
 
 function password(inp, coll, guid, offline, socket) {
diff --git a/server/routing/client/api.js b/server/routing/client/api.js
index b58d3308..841031b4 100644
--- a/server/routing/client/api.js
+++ b/server/routing/client/api.js
@@ -12,6 +12,8 @@ var Functions = require(pathThumbnails + '/handlers/functions.js');
 var Frontpage = require(pathThumbnails + '/handlers/frontpage.js');
 var Search = require(pathThumbnails + '/handlers/search.js');
 var uniqid = require('uniqid');
+var Filter = require('bad-words');
+var filter = new Filter({ placeHolder: 'x'});
 
 var toShowChannel = {
     start: 1,
@@ -1395,7 +1397,7 @@ function cleanChannelName(channel_name) {
     //coll = coll.replace("_", "");
     //coll = encodeURIComponent(coll).replace(/\W/g, '');
     coll = Functions.encodeChannelName(channel_name);
-    //coll = filter.clean(coll);
+    coll = filter.clean(coll);
     return coll;
 }