Don't allow diceless matches in the characters text

Ref #23
haste · Jan 22, 2025 · a84465e · a84465e
1 parent df57163
commit a84465e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 14 deletions.
diff --git a/src/characters.js b/src/characters.js
@@ -264,15 +264,11 @@ export const characterAppWatcher = (showOptionsButton = false) => {
       for (const addedNode of mutation.addedNodes) {
         for (const node of getTextNodes(addedNode)) {
           const parentNode = node.parentElement;
-          if (
-            // Don't embed in item names
-            parentNode.className.includes("itemName") ||
-            isParentsProcessed(parentNode)
-          ) {
+          if (isParentsProcessed(parentNode)) {
             continue;
           }
 
-          embedInText(node);
+          embedInText(node, null, false);
         }
       }
     }

diff --git a/src/utils/web.js b/src/utils/web.js
@@ -37,14 +37,15 @@ export const diceValueFromMatch = ({
   return `${numDice}d${dice}${sign}${modifier}`;
 };
 
-export const isValidDice = (match) => {
+export const isValidDice = (match, allowDicelessModifier = true) => {
   const soloModifierType = match.groups.soloModifierType;
   if (
-    soloModifierType &&
-    !(
-      validSoloModifierType.includes(soloModifierType) ||
-      getCharacterSkills().includes(soloModifierType)
-    )
+    !(allowDicelessModifier || match.groups.dice) ||
+    (soloModifierType &&
+      !(
+        validSoloModifierType.includes(soloModifierType) ||
+        getCharacterSkills().includes(soloModifierType)
+      ))
   ) {
     return false;
   }
@@ -152,13 +153,13 @@ const processPreviousElement = (node, match) => {
   return [null, match];
 };
 
-export const embedInText = (node, labelOrCallback) => {
+export const embedInText = (node, labelOrCallback, allowDicelessModifier) => {
   let offset = 0;
   let fragment;
   let prependNode;
   const textContent = node.textContent;
   for (let match of textContent.matchAll(diceRegex)) {
-    if (!isValidDice(match)) {
+    if (!isValidDice(match, allowDicelessModifier)) {
       continue;
     }