chore: cleanup

Author: feildmaster

src/base/chat/disableEmotes.js

@@ -47,5 +47,5 @@ function updateEmotes() {
   });
 }
 
-compound('Chat:Connected', 'translation:loaded', init);
+compound('Chat:Connected', 'translation:underscript', init);
 eventManager.on('connect', updateEmotes);

src/base/library/deck/storage.js

@@ -9,6 +9,7 @@ import compound from 'src/utils/compoundEvent.js';
 import hasOwn from 'src/utils/hasOwn.js';
 import { cardName } from 'src/utils/cardHelper.js';
 
+// TODO: translation
 const setting = settings.register({
   name: 'Disable Deck Storage',
   key: 'underscript.storage.disable',
@@ -33,17 +34,9 @@ onPage('Decks', function deckStorage() {
   function getFromLibrary(id, library = [], shiny = undefined) {
     return library.find((card) => card.id === id && (shiny === undefined || card.shiny === shiny));
   }
-  function getCardData(id, shiny, deep) {
+  function getCardData(id, shiny) {
+    // TODO: Filter out cards with insufficient quantity
     const library = global('deckCollections', 'collections');
-    if (deep) {
-      // Search all decks
-      const keys = Object.keys(library);
-      for (let i = 0; i < keys.length; i++) {
-        const card = getFromLibrary(id, library[keys[i]], shiny);
-        if (card) return card;
-      }
-      return null;
-    }
     return getFromLibrary(id, library[global('soul')], shiny);
   }
 
@@ -113,10 +106,8 @@ onPage('Decks', function deckStorage() {
       const deck = JSON.parse(localStorage.getItem(key));
       if (!deck) return null;
       if (trim) {
-        return deck.cards.filter(({ id, shiny }) => {
-          const data = getCardData(id, shiny);
-          return data && cardName(data);
-        });
+        // TODO: Filter out cards with insufficient quantity
+        return deck.cards.filter(({ id, shiny }) => getCardData(id, shiny));
       }
       return deck.cards;
     }
@@ -147,6 +138,7 @@ onPage('Decks', function deckStorage() {
     function cards(list) {
       const names = [];
       list.forEach((card) => {
+        // TODO: Filter out cards with insufficient quantity
         let data = getCardData(card.id, card.shiny);
         const name = data ?
           `<span class="${data.rarity}">${cardName(data)}</span>` :
@@ -196,6 +188,7 @@ onPage('Decks', function deckStorage() {
         if (e.type === 'mouseenter') {
           const deck = getDeck(i);
           fixClass(!!deck);
+          // TODO: translation
           if (deck) {
             text = `
               <div id="deckName">${localStorage.getItem(nameKey) || `${soul}-${i + 1}`}</div>

src/base/underscript/patchnotes.js

@@ -13,7 +13,7 @@ wrap(function patchNotes() {
     key: 'underscript.disable.patches',
   });
 
-  cleanData('underscript.update.', scriptVersion, 'last', 'checking', 'latest');
+  cleanData('underscript.update.', scriptVersion, 'last', 'checking', 'debug');
   style.add(css`
     #AlertToast div.uschangelog span:nth-of-type(2) {
       max-height: 300px;

src/hooks/friends.js

@@ -1,7 +1,7 @@
 import axios from 'axios';
 import eventManager from 'src/utils/eventManager.js';
 import decrypt from 'src/utils/decrypt.emails.js';
-import { debugToast as debug } from 'src/utils/debug.js';
+import debug from 'src/utils/debugToast';
 import sleep from 'src/utils/sleep.js';
 import { window } from 'src/utils/1.variables.js';
 

src/hooks/zz.loaded.js

@@ -22,7 +22,7 @@ function done() {
 
 if (location.host.includes('undercards.net')) {
   console.log(`UnderScript(v${scriptVersion}): Loaded`); // eslint-disable-line no-console
-  if (document.title.includes('Undercards')) {
+  if (!location.pathname.includes('/', 1)) {
     register();
   }
 }

src/utils/decrypt.emails.js

@@ -1,7 +1,7 @@
 const selector = 'a[href="/cdn-cgi/l/email-protection"]';
 
 function hexAt(str = '', index = 0) {
-  const r = str.substr(index, 2);
+  const r = str.substring(index, index + 2);
   return parseInt(r, 16);
 }
 

src/utils/menu.js

@@ -86,7 +86,7 @@ export function open() {
         };
         button.on('click', callable)
           .on('keydown', (e) => {
-            if (e.which !== 32 && e.which !== 13) return;
+            if (e.key !== ' ' && e.key !== 'Enter') return;
             e.preventDefault();
             callable(e);
           }).css({
@@ -140,7 +140,7 @@ export function addButton(button = {}) {
     hidden: () => typeof hidden === 'function' && hidden() || false,
   };
   if (button.top) {
-    buttons.splice(0, 0, safeButton);
+    buttons.unshift(safeButton);
   } else {
     buttons.push(safeButton);
   }

src/utils/settings/types/select.js

@@ -24,6 +24,6 @@ export default class Select extends Setting {
 function options(data = [], current = '') {
   return data.map((o) => {
     const [l, v = l] = toArray(o);
-    return `<option value="${v}"${current === `${v}` ? ' selected' : ''}>${translateText(l)}</option>`;
+    return `<option value="${v}"${`${current}` === `${v}` ? ' selected' : ''}>${translateText(l)}</option>`;
   });
 }