ChatSetAttr | Additional Fixes

Author: Nic Bradley

ChatSetAttr/1.11/ChatSetAttr.js

@@ -92,7 +92,7 @@ export class APIWrapper {
       _characterid: character?.id,
     };
     const newAttr = createObj("attribute", newObjProps);
-    await APIWrapper.setAttribute(character.id, name, value, max);
+    await APIWrapper.setAttribute(character, name, value, max);
     globalSubscribeManager.publish("add", newAttr);
     // This is how the previous script was doing it
     globalSubscribeManager.publish("change", newAttr, newAttr);
@@ -110,12 +110,18 @@ export class APIWrapper {
     const messages: string[] = [];
     const attr = await APIWrapper.getAttribute(character, name)
     if (!attr) {
-      errors.push(`updateAttribute: Attribute ${name} does not exist for character with ID ${character?.id}.`);
+      errors.push(`Attribute <strong>${name}</strong> does not exist for character <strong>${character.get("name")}</strong>.`);
       return [{ messages, errors }];
     }
     const oldAttr = JSON.parse(JSON.stringify(attr));
-    await APIWrapper.setAttribute(character.id, name, value, max);
-    messages.push(`Setting <strong>${name}</strong> to <strong>${value}</strong> for character <strong>${character?.get("name")}</strong>.`);
+    await APIWrapper.setAttribute(character, name, value, max);
+    if (value && max) {
+      messages.push(`Setting <strong>${name}</strong> to <strong>${value}</strong> and <strong>${name}_max</strong> to <strong>${max}</strong> for character <strong>${character?.get("name")}</strong>.`);
+    } else if (value) {
+      messages.push(`Setting <strong>${name}</strong> to <strong>${value}</strong> for character <strong>${character?.get("name")}</strong>, max remains unchanged.`);
+    } else if (max) {
+      messages.push(`Setting <strong>${name}_max</strong> to <strong>${max}</strong> for character <strong>${character?.get("name")}</strong>, current remains unchanged.`);
+    }
     globalSubscribeManager.publish("change", { name, current: value, max }, { name, current: oldAttr.value, max: oldAttr.max });
     return [{ messages, errors }];
   };
@@ -164,22 +170,22 @@ export class APIWrapper {
   };
 
   private static async setAttribute(
-    characterID: string,
+    character: Roll20Character,
     attr: string,
     value?: string,
     max?: string
   ): Promise<void> {
     if (state.ChatSetAttr.useWorkers) {
-      await APIWrapper.setWithWorker(characterID, attr, value, max);
+      await APIWrapper.setWithWorker(character.id, attr, value, max);
       return;
     }
     if (value) {
-      const newValue = await setSheetItem(characterID, attr, value, "current");
-      log(`setAttribute: Setting ${attr} to ${JSON.stringify(newValue)} for character with ID ${characterID}.`);
+      await setSheetItem(character.id, attr, value, "current");
+      log(`Setting <strong>${attr}</strong> to <strong>${value}</strong> for character with ID <strong>${character.get("name")}</strong>.`);
     }
     if (max) {
-      const newMax = await setSheetItem(characterID, attr, max, "max");
-      log(`setAttribute: Setting ${attr} max to ${JSON.stringify(newMax)} for character with ID ${characterID}.`);
+      await setSheetItem(character.id, attr, max, "max");
+      log(`Setting <strong>${attr}</strong> max to <strong>${max}</strong> for character <strong>${character.get("name")}</strong>.`);
     }
   };
 
@@ -193,7 +199,7 @@ export class APIWrapper {
     for (const [key, value] of entries) {
       const attribute = await APIWrapper.getAttribute(character, key);
       if (!attribute?.value) {
-        errors.push(`setAttribute: ${key} does not exist for character with ID ${character?.id}.`);
+        errors.push(`Attribute <strong>${key}</strong> does not exist for character <strong>${character.get("name")}</strong>.`);
         return [{ messages, errors }];
       }
       const stringValue = value.value ? value.value.toString() : undefined;
@@ -237,15 +243,46 @@ export class APIWrapper {
     const errors: string[] = [];
     const messages: string[] = [];
     for (const attribute of attributes) {
+      const { section, repeatingID, attribute: attrName } = APIWrapper.extractRepeatingDetails(attribute) || {};
+      if (section && repeatingID && !attrName) {
+        return APIWrapper.deleteRepeatingRow(character, section, repeatingID);
+      }
       const attr = await APIWrapper.getAttr(character, attribute);
       if (!attr) {
-        errors.push(`deleteAttributes: Attribute ${attribute} does not exist for character with ID ${character?.id}.`);
+        errors.push(`Attribute <strong>${attribute}</strong> does not exist for character <strong>${character.get("name")}</strong>.`);
         continue;
       }
       const oldAttr = JSON.parse(JSON.stringify(attr));
       attr.remove();
       globalSubscribeManager.publish("destroy", oldAttr);
-      messages.push(`Attribute ${attribute} deleted for character with ID ${character?.id}.`);
+      messages.push(`Attribute <strong>${attribute}</strong> deleted for character <strong>${character.get("name")}</strong>.`);
+    }
+    return [{ messages, errors }];
+  };
+
+  public static async deleteRepeatingRow(
+    character: Roll20Character,
+    section: string,
+    repeatingID: string
+  ): Promise<[ErrorResponse]> {
+    const errors: string[] = [];
+    const messages: string[] = [];
+    const repeatingAttrs = findObjs<"attribute">({
+      _type: "attribute",
+      _characterid: character.id,
+    }).filter(attr => {
+      const name = attr.get("name");
+      return name.startsWith(`repeating_${section}_${repeatingID}_`);
+    });
+    if (repeatingAttrs.length === 0) {
+      errors.push(`No repeating attributes found for section <strong>${section}</strong> and ID <strong>${repeatingID}</strong> for character <strong>${character.get("name")}</strong>.`);
+      return [{ messages, errors }];
+    }
+    for (const attr of repeatingAttrs) {
+      const oldAttr = JSON.parse(JSON.stringify(attr));
+      attr.remove();
+      globalSubscribeManager.publish("destroy", oldAttr);
+      messages.push(`Repeating attribute <strong>${attr.get("name")}</strong> deleted for character <strong>${character.get("name")}</strong>.`);
     }
     return [{ messages, errors }];
   };
@@ -260,17 +297,17 @@ export class APIWrapper {
       const attr = await APIWrapper.getAttribute(character, attribute);
       const value = attr?.value;
       if (!value) {
-        errors.push(`resetAttributes: Attribute ${attribute} does not exist for character with ID ${character?.id}.`);
+        errors.push(`Attribute <strong>${attribute}</strong> does not exist for character <strong>${character.get("name")}</strong>.`);
         continue;
       }
       const max = attr.max;
       if (!max) {
         continue;
       }
       const oldAttr = JSON.parse(JSON.stringify(attr));
-      APIWrapper.setAttribute(character.id, attribute, max);
+      APIWrapper.setAttribute(character, attribute, max);
       globalSubscribeManager.publish("change", attr, oldAttr);
-      messages.push(`Attribute ${attribute} reset for character with ID ${character?.id}.`);
+      messages.push(`Attribute <strong>${attribute}</strong> reset for character <strong>${character.get("name")}</strong>.`);
     }
     return [{ messages, errors }];
   };
@@ -281,13 +318,10 @@ export class APIWrapper {
   public static extractRepeatingDetails(attributeName: string) {
     const [, section, repeatingID, ...attributeParts] = attributeName.split("_");
     const attribute = attributeParts.join("_");
-    if (!section || !repeatingID || !attribute) {
-      return null;
-    }
     return {
-      section,
-      repeatingID,
-      attribute,
+      section: section || undefined,
+      repeatingID: repeatingID || undefined,
+      attribute: attribute || undefined,
     };
   };
 

ChatSetAttr/README.md

@@ -189,6 +189,9 @@ export class AttrProcessor {
         deltaCurrent = this.replaceMarks(deltaCurrent);
         deltaMax = this.replaceMarks(deltaMax);
       }
+      if (hasRepeating) {
+        deltaName = this.parseRepeating(deltaName);
+      }
       if (this.parse) {
         deltaCurrent = this.parseDelta(deltaCurrent);
         deltaMax = this.parseDelta(deltaMax);
@@ -202,10 +205,7 @@ export class AttrProcessor {
         deltaMax = this.modifyDelta(deltaMax, deltaName, true);
       }
       if (this.constrain) {
-        deltaCurrent = this.constrainDelta(deltaCurrent, deltaMax);
-      }
-      if (hasRepeating) {
-        deltaName = this.parseRepeating(deltaName);
+        deltaCurrent = this.constrainDelta(deltaCurrent, deltaMax, deltaName);
       }
       final[deltaName] = {
         value: deltaCurrent.toString(),
@@ -256,7 +256,6 @@ export class AttrProcessor {
         return value;
       }
     } catch (error) {
-      this.errors.push(`Error evaluating expression ${value}`);
       return value;
     }
   };
@@ -268,9 +267,11 @@ export class AttrProcessor {
       return delta; // Return delta value if attribute not found
     }
     const current = isMax ? attribute.get("max") : attribute.get("current");
-    if (delta === undefined || delta === null) {
-      this.errors.push(`Attribute ${name} has no value to modify.`);
-      return current; // Return original value if no value is found
+    if (delta === undefined || delta === null || delta === "") {
+      if (!isMax) {
+        this.errors.push(`Attribute ${name} has no value to modify.`);
+      }
+      return ""; // Return original value if no value is found
     }
     const deltaAsNumber = Number(delta);
     const currentAsNumber = Number(current);
@@ -282,7 +283,9 @@ export class AttrProcessor {
     return modified.toString();
   };
 
-  private constrainDelta(value: string, max: string): string {
+  private constrainDelta(value: string, maxDelta: string, name: string): string {
+    const attribute = this.attributes.find(attr => attr.get("name") === name);
+    const max = maxDelta ? maxDelta : attribute?.get("max");
     const valueAsNumber = Number(value);
     const maxAsNumber = max === "" ? Infinity : Number(max);
     if (isNaN(valueAsNumber) || isNaN(maxAsNumber)) {
@@ -303,7 +306,7 @@ export class AttrProcessor {
 
   private parseRepeating(name: string): string {
     const { section, repeatingID, attribute } = APIWrapper.extractRepeatingDetails(name) ?? {};
-    if (!section || !attribute) {
+    if (!section) {
       this.errors.push(`Invalid repeating attribute name: ${name}`);
       return name; // Return original name if invalid
     }
@@ -315,7 +318,9 @@ export class AttrProcessor {
     if (matches) {
       const index = Number(matches[0].slice(1));
       const repeatingID = this.repeating.repeatingOrders[section]?.[index];
-      if (repeatingID) {
+      if (repeatingID && !attribute) {
+        return `repeating_${section}_${repeatingID}`;
+      } else if (repeatingID) {
         return `repeating_${section}_${repeatingID}_${attribute}`;
       }
     }
@@ -329,24 +334,49 @@ export class AttrProcessor {
     const entries = Object.entries(this.delta);
     const finalEntries = Object.entries(this.final);
     const newMessage = message
-      .replace(/_NAME(\d+)_/g, (_, index) => {
-        const attr = entries[parseInt(index, 10)];
+      .replace(/_NAME(\d+)_/g, (match, index) => {
+        if (index > entries.length - 1) {
+          this.errors.push(`Invalid index ${index} in _NAME${index}_ placeholder.`);
+          return match; // Return original match if index is invalid
+        }
+        const actualIndex = parseInt(index, 10);
+        const attr = entries[actualIndex];
         return attr[0] ?? "";
       })
-      .replace(/_TCUR(\d+)_/g, (_, index) => {
-        const attr = entries[parseInt(index, 10)];
+      .replace(/_TCUR(\d+)_/g, (match, index) => {
+        if (index > entries.length - 1) {
+          this.errors.push(`Invalid index ${index} in _NAME${index}_ placeholder.`);
+          return match; // Return original match if index is invalid
+        }
+        const actualIndex = parseInt(index, 10);
+        const attr = entries[actualIndex];
         return attr[1].value ?? "";
       })
-      .replace(/_TMAX(\d+)_/g, (_, index) => {
-        const attr = entries[parseInt(index, 10)];
+      .replace(/_TMAX(\d+)_/g, (match, index) => {
+        if (index > entries.length - 1) {
+          this.errors.push(`Invalid index ${index} in _NAME${index}_ placeholder.`);
+          return match; // Return original match if index is invalid
+        }
+        const actualIndex = parseInt(index, 10);
+        const attr = entries[actualIndex];
         return attr[1].max ?? "";
       })
-      .replace(/_CUR(\d+)_/g, (_, index) => {
-        const attr = finalEntries[parseInt(index, 10)];
+      .replace(/_CUR(\d+)_/g, (match, index) => {
+        if (index > entries.length - 1) {
+          this.errors.push(`Invalid index ${index} in _NAME${index}_ placeholder.`);
+          return match; // Return original match if index is invalid
+        }
+        const actualIndex = parseInt(index, 10);
+        const attr = finalEntries[actualIndex];
         return attr[1].value ?? "";
       })
-      .replace(/_MAX(\d+)_/g, (_, index) => {
-        const attr = finalEntries[parseInt(index, 10)];
+      .replace(/_MAX(\d+)_/g, (match, index) => {
+        if (index > entries.length - 1) {
+          this.errors.push(`Invalid index ${index} in _NAME${index}_ placeholder.`);
+          return match; // Return original match if index is invalid
+        }
+        const actualIndex = parseInt(index, 10);
+        const attr = finalEntries[actualIndex];
         return attr[1].max ?? "";
       })
       .replace(/_CHARNAME_/g, this.character.get("name") ?? "");

ChatSetAttr/build/src/classes/APIWrapper.ts

@@ -69,12 +69,13 @@ export class ChatOutput {
     output += this.createHeader();
     output += this.createContent();
     output += this.closeWrapper();
-    log(`ChatOutput: ${output}`);
+    log(`Output: ${output}`);
     sendChat(this.from, output, undefined, { noarchive });
   };
 
   private createWhisper() {
-    if (!this.whisper) {
+    if (this.whisper === false) {
+      log(`ChatOutput: Not sending as whisper`);
       return ``;
     }
     if (this.playerID === "GM") {

ChatSetAttr/build/src/classes/AttrProcessor.ts

@@ -39,7 +39,7 @@ export class ChatSetAttr {
       command,
       flags,
       attributes
-    } = this.InputParser.parse(msg.content);
+    } = this.InputParser.parse(msg);
 
     // #region Command
     if (commandType === CommandType.NONE || !command) {
@@ -57,6 +57,11 @@ export class ChatSetAttr {
 
     // #region Targets
     const targets = this.getTargets(msg, flags);
+    if (targets.length === 0 && actualCommand !== Commands.SET_ATTR_CONFIG) {
+      this.errors.push(`No valid targets found for command ${actualCommand}.`);
+      this.sendMessages();
+      return;
+    }
 
     // #region Act
     TimerManager.start("chatsetattr", 8000, this.sendDelayMessage);
@@ -73,6 +78,7 @@ export class ChatSetAttr {
     }
     const isMuted = flags.some(flag => flag.name === Flags.MUTE);
     if (isMuted) {
+      this.messages = [];
       this.errors = [];
     }
     if (response.errors.length > 0 || response.messages.length > 0) {
@@ -123,11 +129,14 @@ export class ChatSetAttr {
 
   private getTargets(msg: Roll20ChatMessage, flags: Option[]): Roll20Character[] {
     const target = this.targetFromOptions(flags);
+    log(`[ChatSetAttr] Target strategy: ${target}`);
     if (!target) {
       return [];
     }
     const targetStrategy = this.getTargetStrategy(target);
+    log(`[ChatSetAttr] Target message: ${msg.selected}`);
     const targets = this.getTargetsFromOptions(target, flags, msg.selected);
+    log(`[ChatSetAttr] Targets: ${targets.join(", ")}`);
     const [validTargets, { messages, errors }] = targetStrategy.parse(targets, msg.playerid);
     this.messages.push(...messages);
     this.errors.push(...errors);
@@ -208,7 +217,7 @@ export class ChatSetAttr {
   private sendMessages(feedback?: Feedback | null) {
     const sendErrors = this.errors.length > 0;
     const from = feedback?.sender || "ChatSetAttr";
-    const whisper = feedback?.whisper || true;
+    const whisper = feedback?.whisper ?? true;
     if (sendErrors) {
       const header = "ChatSetAttr Error";
       const content = this.errors.map(error => error.startsWith("<") ? error : `<p>${error}</p>`).join("");
@@ -217,12 +226,11 @@ export class ChatSetAttr {
         content,
         from,
         type: "error",
-        whisper: true
+        whisper,
       });
       error.send();
       this.errors = [];
       this.messages = [];
-      return;
     }
     const sendMessage = this.messages.length > 0 || feedback;
     if (!sendMessage) {
@@ -259,7 +267,7 @@ export class ChatSetAttr {
     const publicFlag = flags.find(flag => flag.name === Flags.FB_PUBLIC);
     const header = headerFlag?.value;
     const sender = fromFlag?.value;
-    const whisper = publicFlag?.value === "false" ? false : true;
+    const whisper = publicFlag === undefined;
     return {
       header,
       sender,