Merge remote-tracking branch 'upstream/master'

Author: barisusakli

.editorconfig

@@ -0,0 +1,13 @@
+# Editor configuration, see http://editorconfig.org
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 2
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.md]
+max_line_length = off
+trim_trailing_whitespace = false

LICENSE

@@ -1,8 +1,8 @@
-Copyright (c) 2013-2017, Davis Wainaina <davisjwn@gmail.com>
+Copyright (c) 2013-2019, Davis Wainaina <davisjwn@gmail.com>
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 
 Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
 Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

index.js

@@ -3,6 +3,8 @@
 var winston = require.main.require('winston');
 var meta = require.main.require('./src/meta');
 
+var translator = require.main.require('./src/translator');
+
 var toRegExp = require('./lib/toRegExp');
 var parseContent = require('./lib/parseContent');
 
@@ -24,7 +26,7 @@ var Beep = {
 
 	parseContent: function (content, symbol) {
 		var nil = '^(?!x)x';
-		return parseContent(content, Beep.banned_words || nil, Beep.banned_urls || nil, Beep.censorWholeWord, symbol || '*');
+		return parseContent(content, Beep.banned_words || nil, Beep.banned_urls || nil, Beep.censorWholeWord, symbol || '*');
 	},
 	toRegExp: toRegExp,
 	loadList: function (callback) {
@@ -84,7 +86,7 @@ var Beep = {
 				return callback(null, config);
 			}
 			config.beep = {
-				censorWholeWord: censorWholeWord === 'on'
+				censorWholeWord: censorWholeWord === 'on',
 			};
 			callback(err, config);
 		});
@@ -95,11 +97,15 @@ var Beep = {
 
 		var titleMatch = postTitle && postTitle.match(Beep.illegal_words);
 		if (titleMatch) {
-			return callback(new Error('You may not use the word "' + titleMatch[0] + '" in your title.'));
+			return translator.translate('[[beep:titleMatch.error, ' + titleMatch[0] + ']]', function (translated) {
+				callback(new Error(translated));
+			});
 		}
 		var contentMatch = postContent && postContent.match(Beep.illegal_words);
 		if (contentMatch) {
-			return callback(new Error('You may not use the word "' + contentMatch[0] + '" in your post.'));
+			return translator.translate('[[beep:contentMatch.error, ' + contentMatch[0] + ']]', function (translated) {
+				callback(new Error(translated));
+			});
 		}
 
 		callback(null, data);
@@ -133,20 +139,13 @@ var Beep = {
 		data.userData.signature = Beep.parseContent(data.userData.signature);
 		callback(null, data);
 	},
-	onTopicsGet: function (data, callback) {
-		data.topics.forEach(Beep.parseTopic);
-		callback(null, data);
-	},
-	onTopicGet: function (data, callback) {
-		Beep.parseTopic(data.topic);
-		callback(null, data);
-	},
-	onGetPostSummaries: function (data, callback) {
-		data.posts.forEach(function (post) {
-			if (post) {
-				Beep.parseTopic(post.topic);
-			}
-		});
+	parseTopic: function (data, callback) {
+		// 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);
 	},
 	parseTopic: function (topic) {
@@ -166,7 +165,9 @@ var Beep = {
 		});
 
 		if (match) {
-			return callback(new Error('You may not use the word "' + match[0] + '" in your tags.'));
+			return translator.translate('[[beep:tagMatch.error, ' + match[0] + ']]', function (translated) {
+				callback(new Error(translated));
+			});
 		}
 
 		data.tags = data.tags.map(function (tag) {
@@ -178,12 +179,12 @@ var Beep = {
 	admin: {
 		menu: function (custom_header, callback) {
 			custom_header.plugins.push({
-				'route': '/plugins/beep',
-				'icon': 'fa-microphone-slash',
-				'name': 'Censor Curse Words'
+				route: '/plugins/beep',
+				icon: 'fa-microphone-slash',
+				name: 'Censor Curse Words',
 			});
 			callback(null, custom_header);
-		}
+		},
 	},
 	post: {
 		getFields: function (data, callback) {
@@ -193,14 +194,14 @@ var Beep = {
 				});
 			}
 			callback(null, data);
-		}
+		},
 	},
 	messaging: {
 		getTeaser: function (data, callback) {
 			data.teaser.content = Beep.parseContent(data.teaser.content);
 			callback(null, data);
-		}
-	}
+		},
+	},
 };
 
 module.exports = Beep;

languages/en_GB/beep.json

@@ -0,0 +1,5 @@
+{
+	"titleMatch.error": "You may not use the word \"%1\" in your title.",
+	"contentMatch.error": "You may not use the word \"%1\" in your post.",
+	"tagMatch.error": "You may not use the word \"%1\" in your tags."
+}

languages/it/beep.json

@@ -0,0 +1,5 @@
+{
+	"titleMatch.error": "Non puoi usare la parola \"%1\" nel titolo.",
+	"contentMatch.error": "Non puoi usare la parola \"%1\" ne post.",
+	"tagMatch.error": "Non puoi usare la parola \"%1\" nei tags."
+}

lib/parseContent.js

@@ -3,33 +3,34 @@
 var isLatin = /^\w+$/;
 
 function parseContent(content, banned_words, banned_urls, censorWholeWord, symbol) {
-  if (!content) {
-    return content;
-  }
-
-  symbol = symbol || '*';
-
-  function censor(match) {
-    if (!isLatin.test(match)) {
-      return '[censored]';
-    }
-
-    var l = match.length;
-    var out = match[0];
-
-    var i = l - 2;
-    while (i) {
-      out += symbol;
-      i--;
-    }
-
-    return out + match[l - 1];
-  }
-
-  var replacement = censorWholeWord ? '[censored]' : censor;
-  return content
-    .replace(banned_words, replacement)
-    .replace(banned_urls, '[link removed]');
+	if (!content) {
+		return content;
+	}
+
+	symbol = symbol || '*';
+
+	function censor(match) {
+		if (!isLatin.test(match)) {
+			return '[censored]';
+		}
+
+		var l = match.length;
+		var out = match[0];
+
+		var i = l - 2;
+		while (i) {
+			out += symbol;
+			// eslint-disable-next-line no-plusplus
+			i--;
+		}
+
+		return out + match[l - 1];
+	}
+
+	var replacement = censorWholeWord ? '[censored]' : censor;
+	return content
+		.replace(banned_words, replacement)
+		.replace(banned_urls, '[link removed]');
 }
 
 module.exports = parseContent;

lib/toRegExp.js

@@ -3,39 +3,39 @@
 var isLatin = /^\w+$/;
 
 function toRegExp(arr, fullWord) {
-  if (!Array.isArray(arr)) {
-    arr = (arr || '').toString().split(',');
-  }
-  arr = arr.filter(Boolean);
+	if (!Array.isArray(arr)) {
+		arr = (arr || '').toString().split(',');
+	}
+	arr = arr.filter(Boolean);
 
-  var str;
-  if (fullWord) {
-    var latin = arr.filter(function (word) {
-      return isLatin.test(word);
-    }).map(function (word) {
-      return word.trim().replace(/([-[\]{}()*+?.,\\^$|#\s])/g, '\\$1');
-    }).join('|');
+	var str;
+	if (fullWord) {
+		var latin = arr.filter(function (word) {
+			return isLatin.test(word);
+		}).map(function (word) {
+			return word.trim().replace(/([-[\]{}()*+?.,\\^$|#\s])/g, '\\$1');
+		}).join('|');
 
-    var notLatin = arr.filter(function (word) {
-      return !isLatin.test(word);
-    }).map(function (word) {
-      return word.trim().replace(/([-[\]{}()*+?.,\\^$|#\s])/g, '\\$1');
-    }).join('|');
+		var notLatin = arr.filter(function (word) {
+			return !isLatin.test(word);
+		}).map(function (word) {
+			return word.trim().replace(/([-[\]{}()*+?.,\\^$|#\s])/g, '\\$1');
+		}).join('|');
 
-    if (latin && notLatin) {
-      str = '\\b(?:' + latin + ')\\b|(?:' + notLatin + ')';
-    } else if (latin) {
-      str = '\\b(?:' + latin + ')\\b';
-    } else if (notLatin) {
-      str = notLatin;
-    }
-  } else {
-    str = arr.filter(Boolean).map(function (word) {
-      return word.trim().replace(/([-[\]{}()*+?.,\\^$|#\s])/g, '\\$1');
-    }).join('|');
-  }
+		if (latin && notLatin) {
+			str = '\\b(?:' + latin + ')\\b|(?:' + notLatin + ')';
+		} else if (latin) {
+			str = '\\b(?:' + latin + ')\\b';
+		} else if (notLatin) {
+			str = notLatin;
+		}
+	} else {
+		str = arr.filter(Boolean).map(function (word) {
+			return word.trim().replace(/([-[\]{}()*+?.,\\^$|#\s])/g, '\\$1');
+		}).join('|');
+	}
 
-  return new RegExp(str || '^(?!x)x', 'ig');
+	return new RegExp(str || '^(?!x)x', 'ig');
 }
 
 module.exports = toRegExp;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-beep",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "description": "NodeBB Censor Curse Words Plugin",
   "main": "index.js",
   "scripts": {

plugin.json

@@ -29,5 +29,7 @@
 		{ "hook": "filter:config.get", "method": "appendConfig" },
 
 		{ "hook": "filter:messaging.getTeaser", "method": "messaging.getTeaser" }
-	]
+	],
+	"languages": "languages",
+	"defaultLang": "en_GB"
 }

tests/parseContent.spec.js

@@ -11,39 +11,39 @@ var nil = '^(?!x)x';
 var symbol = '⁎';
 
 assert.strictEqual(parseContent(
-  'A whole lot of poop causes a ton of shit, shitzu, repoopulate',
-  bannedWords,
-  nil
+	'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,
-  symbol
+	'A whole lot of poop causes a ton of shit, shitzu, repoopulate',
+	bannedWords,
+	nil,
+	false,
+	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',
-  bannedWords,
-  nil,
-  true
+	'A whole lot of poop causes a ton of shit, shitzu, repoopulate',
+	bannedWords,
+	nil,
+	true
 ), 'A whole lot of [censored] causes a ton of [censored], shitzu, repoopulate');
 
 assert.strictEqual(parseContent(
-  'My favorite website is http://example.com. I also love http://foo.bar.',
-  nil,
-  bannedUrls,
-  false
+	'My favorite website is http://example.com. I also love http://foo.bar.',
+	nil,
+	bannedUrls,
+	false
 ), 'My favorite website is [link removed]. I also love [link removed].');
 
 var unicodeBannedWords = toRegExp(['今', '野'], true);
 assert.strictEqual(parseContent(
-  '載点代示早面通今就焼初哲野質',
-  unicodeBannedWords,
-  nil,
-  false
+	'載点代示早面通今就焼初哲野質',
+	unicodeBannedWords,
+	nil,
+	false
 ), '載点代示早面通[censored]就焼初哲[censored]質');
 
 console.log('parseContent passed');