linting

package.json

@@ -43,7 +43,7 @@
   "devDependencies": {
     "@sentry/cli": "^2.32.2",
     "@sprout2000/esbuild-copy-plugin": "^1.1.15",
-    "@wordpress/eslint-plugin": "^20.0.0",
+    "@wordpress/eslint-plugin": "^19.2.0",
     "archiver": "^7.0.1",
     "chalk": "^5.3.0",
     "chrome-webstore-upload-cli": "^3.3.0",

src/modules/better-journal/modules/journal-list/index.js

@@ -1,4 +1,10 @@
-import { addStyles, getData, getSetting, makeElement, onJournalEntry } from '@utils';
+import {
+  addStyles,
+  getData,
+  getSetting,
+  makeElement,
+  onJournalEntry
+} from '@utils';
 
 import styles from './styles.css';
 
@@ -33,8 +39,8 @@ const otherStrings = [
   'Inside, I found</b>',
   'Loyalty Chest and received:',
   'I sifted through my Dragon Nest and found</b>',
-  "my Skyfarer's Oculus and discovered the following loot:",
-  "my Skyfarer's Oculus and discovered:",
+  'my Skyfarer\'s Oculus and discovered the following loot:',
+  'my Skyfarer\'s Oculus and discovered:',
 ];
 
 const classesToSkip = [
@@ -63,6 +69,7 @@ const makeListItems = (itemList) => {
 };
 
 let allItems = null;
+let linkItems = null;
 /**
  * Split the text into items.
  *
@@ -72,34 +79,21 @@ let allItems = null;
  */
 const splitText = async (text) => {
   const items = text.split(/<br>|, (?=\d)| and (?=\d)/);
-  let itemsToReturn = items;
 
   if (! allItems) {
     allItems = await getData('items');
   }
 
-  if (getSetting('better-journal-list.link-all-items')) {
-    itemsToReturn = items.map((item) => {
-      // If it's a link, return it as is.
-      if (item.includes('<a')) {
-        return item.trim();
-      }
-
-      console.log(`looking up "${item.trim()}"`);
-
+  return items.map((item) => {
+    if (linkItems) {
       const itemData = allItems.find((i) => i.name === item.trim().replace(/^\d+ /, ''));
-
-      if (! itemData) {
-        return item.trim();
+      if (itemData) {
+        return `<a class="loot" title="" href="https://www.mousehuntgame.com/item.php?item_type=${itemData.type}" onclick="hg.views.ItemView.show('${itemData.type}'); return false;">${item}</a>`;
       }
+    }
 
-      return `<a class="loot" title="" href="https://www.mousehuntgame.com/item.php?item_type=${itemData.type}" onclick="hg.views.ItemView.show('${itemData.type}'); return false;">${item}</a>`;
-    }).filter(Boolean);
-  } else {
-    itemsToReturn = items.map((item) => item.trim()).filter(Boolean);
-  }
-
-  return itemsToReturn;
+    return item.trim();
+  }).filter(Boolean);
 };
 
 /**
@@ -229,5 +223,7 @@ const formatAsList = async (entry) => {
 export default async () => {
   addStyles(styles, 'better-journal-list');
 
+  linkItems = getSetting('better-journal-list.link-all-items');
+
   onJournalEntry(formatAsList, 3000);
 };

src/modules/better-maps/modules/highlighting.js

@@ -103,16 +103,7 @@ const areaHighlightingFloatingIslands = () => {
 
   const islandPowerType = powerTypeMappings[fiAtts.island_power_type] || '';
 
-  let floorCategory;
-
-  console.log(islandType, islandPowerType);
-
-  if ('sp' === islandType) {
-    floorCategory = document.querySelector('.mouse-category-wrapper.mouse-category-esp-sky_palace');
-  } else {
-    floorCategory = document.querySelector(`.mouse-category-wrapper.mouse-category-esp-${islandPowerType}`);
-  }
-
+  const floorCategory = 'sp' === islandType ? document.querySelector('.mouse-category-wrapper.mouse-category-esp-sky_palace') : document.querySelector(`.mouse-category-wrapper.mouse-category-esp-${islandPowerType}`);
   if (! floorCategory) {
     return false;
   }

src/utils/shared/open-all.js

@@ -3,7 +3,8 @@ import { getSetting, onNavigation, waitForElement } from '@utils';
 /**
  * Replace the convertible open action.
  *
- * @param {HTMLElement} element The element.
+ * @param {HTMLElement} element   The element.
+ * @param {boolean}     allButOne If all but one should be opened.
  */
 const useConvertible = async (element, allButOne = false) => {
   if ((element.getAttribute('data-item-action') !== 'all-but-one') && (element.getAttribute('data-item-action') !== 'all')) {