Merge pull request #15 from cedricouellet/develop

censorship removed, browser notifs fixed, refactor, zalgo usernames

app.js

@@ -4,10 +4,10 @@ const http = require("http");
 const socketIO = require("socket.io");
 const express = require("express");
 
-const { events } = require("./helpers/constants");
-const sanitizer = require("./helpers/sanitizer");
-const messaging = require("./helpers/messaging");
-const users = require("./helpers/users");
+const { events } = require("./lib/constants");
+const messaging = require("./lib/messaging");
+const users = require("./lib/users");
+const isZalgo = require("./helpers/isZalgo");
 
 const PORT = parseInt(process.env.PORT) || 3000;
 
@@ -59,17 +59,17 @@ function receiveChatMessage(socket, message) {
       return;
     }
 
-    if (messaging.getZalgoScore(message)) {
+    if (isZalgo(message)) {
       socket.emit(events.MESSAGE,
-        messaging.generateServerMessage("Zalgo is not supported...\n\nFuck off!")
+        messaging.generateServerMessage("Nice try, but Zalgo is not allowed...")
       );
 
       return;
     }
 
     const messageObject = {
       sender: sender,
-      text: sanitizer.sanitize(message || "hi"),
+      text: message.trim(),
     };
 
     io.emit(events.MESSAGE, messageObject);
@@ -88,6 +88,10 @@ function receiveChatMessage(socket, message) {
 
 function joinUser(socket, username) {
   try {
+    if (isZalgo(username.trim())) {
+      username = "I think I'm funny because I use Zalgo";
+    }
+
     const joined = users.add(socket.id, username);
 
     socket.emit(events.JOIN, joined.username);

helpers/isZalgo.js

@@ -0,0 +1,20 @@
+/**
+ * Detects if a string contains Zalgo text.
+ * @param {string} str The string to test.
+ * @return {boolean} If the string contains Zalgo or not.
+ */
+function isZalgo(str) {
+  if (str.length === 0) return false;
+
+  const reg = new RegExp(/([aeiouy]\u0308)|[\u0300-\u036f\u0489]/, "gi");
+  const charBites = str.match(/[\s\S]{1,3}/g).length;
+  let rawScore = 0;
+
+  str.split("").forEach(char => {
+    if (reg.test(char)) rawScore++;
+  });
+
+  return rawScore / charBites >= 1;
+}
+
+module.exports = isZalgo;

lib/messaging.js

@@ -0,0 +1,17 @@
+const {BOT_NAME} = require('./constants');
+
+/**
+ * Generate a message coming from the server.
+ * @param {string} message The message to send.
+ * @return {{sender: string, text: string}} The message object containing the sender and text.
+ */
+function generateServerMessage(message) {
+  return {
+    sender: BOT_NAME,
+    text: message,
+  };
+}
+
+module.exports = {
+  generateServerMessage,
+};

helpers/users.js → lib/users.js

@@ -1,5 +1,4 @@
 const { BOT_NAME } = require("./constants");
-const sanitizer = require('./sanitizer');
 
 let users = [];
 
@@ -11,7 +10,7 @@ let users = [];
  */
 function add(id, username) {
   id = id.trim();
-  username = sanitizer.sanitize(username);
+  username = username.trim();
   let existing = users.find((user) => user.username === username);
 
   if (existing !== undefined || username === BOT_NAME) {

public/js/chat.js

@@ -14,6 +14,8 @@ const EV_USERS = "users";
 const EV_SUBMIT = "submit";
 const EV_MOUSEOVER = "mouseover";
 const EV_CHANGE = "change";
+const EV_FOCUS = "focus";
+const EV_BLUR = "blur";
 
 // DOM elements
 const faviconHolder = document.getElementById("favicon");
@@ -28,6 +30,9 @@ let username = sessionStorage.getItem(KEY_USERNAME) || "Guest";
 let notificationsEnabled = localStorage.getItem(KEY_NOTIFICATIONS) === 'true' || false;
 notifyCheckbox.checked = notificationsEnabled;
 
+// Utility variables
+let isFocused = true;
+
 // Notification senders
 const notifier = new BrowserNotifier(window);
 const notificationDisplayer = new NotificationDisplayer(faviconHolder, NOTIFICATION_FAVICON);
@@ -43,7 +48,16 @@ socket.on(EV_USERS, onUsersReceived);
 
 // DOM event listeners
 chatForm.addEventListener(EV_SUBMIT, onSubmitClicked);
-window.addEventListener(EV_MOUSEOVER, () => notificationDisplayer.clearNotifications());
+
+window.addEventListener(EV_FOCUS, () => {
+  isFocused = true;
+  notificationDisplayer.clearNotifications();
+});
+
+window.addEventListener(EV_BLUR, () => {
+  isFocused = false;
+});
+
 notifyCheckbox.addEventListener(EV_CHANGE, (e) => {
   notificationsEnabled = e.target.checked;
   localStorage.setItem(KEY_NOTIFICATIONS, notificationsEnabled);
@@ -66,7 +80,7 @@ function onMessageReceived(messageObject) {
   if (messageObject?.sender !== username) {
     notificationDisplayer.addNotification();
 
-    if (notificationsEnabled === true) {
+    if (notificationsEnabled === true && isFocused === false) {
       notifier.notify(`${messageObject?.sender}: ${messageObject?.text}`);
     }
   }