Merge pull request #5 from rafaismyname/feature/update

0.2.4

.eslintrc

@@ -4,7 +4,8 @@
   "rules": {
     "no-console": ["error", { allow: ["warn", "error"] }],
     "func-names": ["error", "as-needed"],
-    "max-len": ["error", { "code": 160 }]
+    "max-len": ["error", { "code": 160 }],
+    "max-classes-per-file": ["error", 3]
   },
   "globals": {
    "browser": true,

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.2.4 - Hidelist fix (2020-10-21)
+  * Hidelist bug fix
+
 ## 0.2.3 - Hidelist fix (2018-11-21)
   * Hidelist bug fix
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "whatsbuddy",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "description": "WebExtension that adds extra functionalities to WhatsApp Web™️",
   "license": "MIT",
   "bugs": {
@@ -24,14 +24,14 @@
     "build": "parcel build src/manifest.json"
   },
   "devDependencies": {
-    "eslint": "^4.13.1",
-    "eslint-config-airbnb-base": "^12.1.0",
-    "eslint-plugin-import": "^2.8.0",
-    "parcel": "^1.10.1",
-    "parcel-plugin-web-extension": "^1.4.0",
-    "sass": "^1.14.1"
+    "eslint": "^7.11.0",
+    "eslint-config-airbnb-base": "^14.2.0",
+    "eslint-plugin-import": "^2.22.1",
+    "parcel": "^1.12.4",
+    "parcel-plugin-web-extension": "^1.6.1",
+    "sass": "^1.27.0"
   },
   "dependencies": {
-    "spectre.css": "^0.5.3"
+    "spectre.css": "^0.5.9"
   }
 }

src/chat/chat.js

@@ -1,9 +1,9 @@
 import * as storage from '../helpers/storage';
-import { onChatOpen } from '../helpers/events';
+import { onChatOpen } from './events';
 
 const MESSAGE_INPUT_SELECTOR = '#main footer div[contenteditable]';
 const SEND_BUTTON_CHILD_SELECTOR = '#main footer button span[data-icon=send]';
-const CHAT_FOOTER_SELECTOR = '#main div[data-asset-chat-background] ~ footer';
+const CHAT_FOOTER_SELECTOR = '#main div[data-asset-chat-background] ~ footer, #main div[data-asset-chat-background-dark] ~ footer';
 
 const TOOLS_CONTAINER_ID = 'whatsbuddy-tools-container';
 const TOOLS_BUTTON_CLASSNAME = 'whatsbuddy-tools-button';

src/chat/events.js

@@ -0,0 +1,18 @@
+const CHAT_CONTAINER_SELECTOR = '#main div[data-asset-chat-background], #main div[data-asset-chat-background-dark]';
+
+export const onChatOpen = (callback) => {
+  const onNodeInserted = (element) => {
+    if (element.target.id !== 'main') return true;
+
+    const chatContainer = document.querySelector(CHAT_CONTAINER_SELECTOR);
+    if (!chatContainer) return true;
+
+    callback();
+
+    return true;
+  };
+
+  document.addEventListener('DOMNodeInserted', onNodeInserted, false);
+};
+
+export default { onChatOpen };

src/helpers/events.js

@@ -1,5 +1,3 @@
-const CHAT_CONTAINER_SELECTOR = '#main div[data-asset-chat-background]';
-
 export const onDocumentReady = (callback) => {
   if (document.attachEvent ? document.readyState === 'complete' : document.readyState !== 'loading') {
     callback();
@@ -8,21 +6,6 @@ export const onDocumentReady = (callback) => {
   }
 };
 
-export const onChatOpen = (callback) => {
-  const onNodeInserted = (element) => {
-    if (element.target.id !== 'main') return true;
-
-    const chatContainer = document.querySelector(CHAT_CONTAINER_SELECTOR);
-    if (!chatContainer) return true;
-
-    callback();
-
-    return true;
-  };
-
-  document.addEventListener('DOMNodeInserted', onNodeInserted, false);
-};
-
 export const onClick = (selector, callback) => {
   const element = (() => {
     if (typeof selector === 'string') {

src/helpers/storage.js

@@ -5,37 +5,31 @@ const storage = () => {
     if (chrome.storage) {
       section = chrome.storage.sync || chrome.storage.local;
     }
-  } catch(e) {} //eslint-disable-line
+  } catch (e) {} //eslint-disable-line
 
   try {
     if (window.storage) {
       section = window.storage.local;
     }
-  } catch(e) {} //eslint-disable-line
+  } catch (e) {} //eslint-disable-line
 
   try {
     if (browser.storage) {
       section = browser.storage.local;
     }
-  } catch(e) {} //eslint-disable-line
+  } catch (e) {} //eslint-disable-line
 
   return section;
 };
 
-export const save = keys => (
-  new Promise((resolve) => {
-    storage().set(keys, () => resolve(true));
-  })
-);
+export const save = (keys) => new Promise((resolve) => {
+  storage().set(keys, () => resolve(true));
+});
 
-export const get = keys => (
-  new Promise((resolve) => {
-    storage().get(keys, items => resolve(items));
-  })
-);
+export const get = (keys) => new Promise((resolve) => {
+  storage().get(keys, (items) => resolve(items));
+});
 
-export const remove = keys => (
-  new Promise((resolve) => {
-    storage().remove(keys, items => resolve(items));
-  })
-);
+export const remove = (keys) => new Promise((resolve) => {
+  storage().remove(keys, (items) => resolve(items));
+});

src/list/events.js

@@ -1,16 +1,10 @@
 const SIDE_PANE_SELECTOR = '#pane-side';
-const SIDE_PANE_ROOT_CLASSNAME = 'app';
 
 export const onSidePaneLoaded = (callback) => {
   const paneObserver = new MutationObserver((mutations, observer) => {
     mutations.some((mutation) => {
       const addedNodes = [...mutation.addedNodes];
       return addedNodes.some((node) => {
-        const nodeClass = node.className && node.className.includes && node.className;
-        if (!nodeClass || !nodeClass.includes(SIDE_PANE_ROOT_CLASSNAME)) {
-          return false;
-        }
-
         const sidePane = node.querySelector(SIDE_PANE_SELECTOR);
         if (!sidePane) return false;
 
@@ -26,4 +20,4 @@ export const onSidePaneLoaded = (callback) => {
   return paneObserver.observe(document, { childList: true, subtree: true });
 };
 
-export default {};
+export default { onSidePaneLoaded };

src/list/list.js

@@ -18,5 +18,5 @@ const storageParams = { enableHideChats: true };
 storage.get(storageParams).then(({ enableHideChats }) => {
   if (!enableHideChats) return;
 
-  onSidePaneLoaded(sidePane => sidePaneLoadCallback(sidePane));
+  onSidePaneLoaded((sidePane) => sidePaneLoadCallback(sidePane));
 });

src/manifest.json

@@ -3,7 +3,7 @@
 
   "name": "WABuddy",
   "description": "WebExtension that adds extra functionalities to WhatsApp Web™️",
-  "version": "0.2.3",
+  "version": "0.2.4",
 
   "icons": {
     "512": "./icons/icon.png",

src/options/chat/macros.js

@@ -27,7 +27,7 @@ const renderEnableSwitch = () => {
 
 const toggleEnableSwitch = () => {
   const enabled = state.macrosEnabled;
-  state = Object.assign({}, state, { macrosEnabled: !enabled });
+  state = { ...state, macrosEnabled: !enabled };
 
   renderEnableSwitch();
 };
@@ -105,15 +105,15 @@ onClick(ADD_MACRO_BUTTON_SELECTOR, () => insertMacro());
 export const save = () => {
   const macros = serializeMacros();
 
-  state = Object.assign({}, state, { macros });
+  state = { ...state, macros };
 
   return storage.save(state);
 };
 
 onDocumentReady(() => {
   storage.get(state)
     .then((response) => {
-      state = Object.assign({}, state, response);
+      state = { ...state, ...response };
     })
     .then(() => renderEnableSwitch())
     .then(() => renderMacros());

src/options/list/chats.js

@@ -22,7 +22,7 @@ const renderHideChatEnableSwitch = () => {
 
 const toggleHideChatEnableSwitch = () => {
   const enabled = state.enableHideChats;
-  state = Object.assign({}, state, { enableHideChats: !enabled });
+  state = { ...state, enableHideChats: !enabled };
 
   renderHideChatEnableSwitch();
 };
@@ -57,8 +57,8 @@ const insertChat = (chat, chats) => {
 
 const renderChatList = () => {
   const { chats, hiddenChats } = state;
-  const filteredChats = chats.filter(chat => !hiddenChats.includes(chat.id));
-  filteredChats.forEach(chat => insertChat(chat, chats));
+  const filteredChats = chats.filter((chat) => !hiddenChats.includes(chat.id));
+  filteredChats.forEach((chat) => insertChat(chat, chats));
 };
 
 const insertHiddenChat = (chat, chats) => {
@@ -91,7 +91,7 @@ const insertHiddenChat = (chat, chats) => {
 const renderHiddenChatList = () => {
   const { chats, hiddenChats } = state;
   hiddenChats.forEach((chatId) => {
-    const chat = chats.find(c => c.id === chatId) || { id: chatId };
+    const chat = chats.find((c) => c.id === chatId) || { id: chatId };
     insertHiddenChat(chat, chats);
   });
 };
@@ -100,21 +100,21 @@ const serializeHiddenChatList = () => {
   const chatsContainer = document.querySelector(HIDDEN_CHATS_CONTAINER_SELECTOR);
   const hiddenList = chatsContainer.querySelectorAll('tr td:last-child');
 
-  return ([...hiddenList]).map(node => node.dataset.chatId);
+  return ([...hiddenList]).map((node) => node.dataset.chatId);
 };
 
 export const save = () => {
   const hiddenChats = serializeHiddenChatList();
 
-  state = Object.assign({}, state, { hiddenChats });
+  state = { ...state, hiddenChats };
 
   return storage.save(state);
 };
 
 onDocumentReady(() => {
   storage.get(state)
     .then((response) => {
-      state = Object.assign({}, state, response);
+      state = { ...state, ...response };
     })
     .then(() => renderHideChatEnableSwitch())
     .then(() => renderChatList())