Merge pull request ninenine#31 from pitaj/master

Filter tags, refactor `is_topic`, fix tests

Author: ninenine

index.js

@@ -22,9 +22,9 @@ var Beep = {
 	banned_urls: null,
 	illegal_words: null,
 
-	parseContent: function (content, is_topic=false) {
+	parseContent: function (content, symbol) {
 		var nil = '^(?!x)x';
-		return parseContent(content, Beep.banned_words || nil, Beep.banned_urls || nil, Beep.censorWholeWord, is_topic);
+		return parseContent(content, Beep.banned_words || nil, Beep.banned_urls || nil, Beep.censorWholeWord, symbol || '*');
 	},
 	toRegExp: toRegExp,
 	loadList: function (callback) {
@@ -105,7 +105,7 @@ var Beep = {
 		callback(null, data);
 	},
 	onListChange: function (hash) {
-		if (hash === 'settings:beep') {
+		if (hash && hash.plugin === 'beep') {
 			Beep.loadList(function () {});
 		}
 	},
@@ -131,10 +131,28 @@ var Beep = {
 		callback(null, data);
 	},
 	parseTopic: function (data, callback) {
-		var is_topic=true
-		data.topic.title = Beep.parseContent(data.topic.title, is_topic);
-		data.topic.slug = Beep.parseContent(data.topic.slug, is_topic);
-		data.topic.titleRaw = Beep.parseContent(data.topic.titleRaw, is_topic);
+  	// from http://htmlarrows.com/symbols/
+		var starHTML = '⁎';
+		data.topic.title = Beep.parseContent(data.topic.title, starHTML);
+		data.topic.slug = Beep.parseContent(data.topic.slug, starHTML);
+		data.topic.titleRaw = Beep.parseContent(data.topic.titleRaw, starHTML);
+
+		callback(null, data);
+	},
+	filterTags: function (data, callback) {
+		var match;
+		data.tags.some(function (tag) {
+			match = tag && tag.match(Beep.illegal_words);
+			return !!match;
+		});
+
+		if (match) {
+			return callback(new Error('You may not use the word "' + match[0] + '" in your tags.'));
+		}
+
+		data.tags = data.tags.map(function (tag) {
+			return Beep.parseContent(tag, '+');
+		});
 
 		callback(null, data);
 	},

lib/parseContent.js

@@ -2,12 +2,12 @@
 
 var isLatin = /^\w+$/;
 
-function parseContent(content, banned_words, banned_urls, censorWholeWord, is_topic) {
+function parseContent(content, banned_words, banned_urls, censorWholeWord, symbol) {
   if (!content) {
     return content;
   }
-  // from http://htmlarrows.com/symbols/
-  var sym = is_topic ? '*' : '⁎';
+
+  symbol = symbol || '*';
 
   function censor(match) {
     if (!isLatin.test(match)) {
@@ -19,7 +19,7 @@ function parseContent(content, banned_words, banned_urls, censorWholeWord, is_to
 
     var i = l - 2;
     while (i) {
-      out += sym;
+      out += symbol;
       i--;
     }
 

plugin.json

@@ -18,6 +18,7 @@
 
 		{ "hook": "filter:topic.create", "method": "parseTopic" },
 		{ "hook": "filter:topic.edit", "method": "parseTopic" },
+		{ "hook": "filter:tags.filter", "method": "filterTags" },
 
 		{ "hook": "filter:topic.create", "method": "checkForIllegalWords" },
 		{ "hook": "filter:topic.edit", "method": "checkForIllegalWords" },

tests/parseContent.spec.js

@@ -8,15 +8,21 @@ var parseContent = require('../lib/parseContent');
 var bannedWords = toRegExp(['poop', 'shit'], true);
 var bannedUrls = toRegExp(['http://example.com', 'http://foo.bar']);
 var nil = '^(?!x)x';
-var is_topic = true;
+var symbol = '⁎';
+
+assert.strictEqual(parseContent(
+  'A whole lot of poop causes a ton of shit, shitzu, repoopulate',
+  bannedWords,
+  nil
+), 'A whole lot of p**p causes a ton of s**t, shitzu, repoopulate');
 
 assert.strictEqual(parseContent(
   'A whole lot of poop causes a ton of shit, shitzu, repoopulate',
   bannedWords,
   nil,
   false,
-  is_topic
-), 'A whole lot of p**p causes a ton of s**t, shitzu, repoopulate');
+  symbol
+), 'A whole lot of p⁎⁎p causes a ton of s⁎⁎t, shitzu, repoopulate');
 
 assert.strictEqual(parseContent(
   'A whole lot of poop causes a ton of shit, shitzu, repoopulate',