fix(variables): currency variables to get user from trigger (#3021) (#…

…3024) * fix(variables): currency variables to get user from trigger * add null check back
crowbartools · Mar 10, 2025 · ed15c77 · ed15c77
1 parent 290917e
commit ed15c77
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/backend/variables/builtin/currency/currency-rank.ts b/src/backend/variables/builtin/currency/currency-rank.ts
@@ -1,4 +1,4 @@
-import { ReplaceVariable } from "../../../../types/variables";
+import { ReplaceVariable, Trigger } from "../../../../types/variables";
 import { OutputDataType, VariableCategory } from "../../../../shared/variable-constants";
 
 import currencyAccess from "../../../currency/currency-access";
@@ -18,7 +18,8 @@ const model : ReplaceVariable = {
         categories: [VariableCategory.USER, VariableCategory.NUMBERS],
         possibleDataOutput: [OutputDataType.NUMBER]
     },
-    evaluator: async (_, currencyName: string, username: string) => {
+    evaluator: async (trigger: Trigger, currencyName: string, username?: string) => {
+        username ??= trigger.metadata.username;
         if (currencyName == null || username == null) {
             return 0;
         }

diff --git a/src/backend/variables/builtin/currency/currency.ts b/src/backend/variables/builtin/currency/currency.ts
@@ -1,4 +1,4 @@
-import { ReplaceVariable } from "../../../../types/variables";
+import { ReplaceVariable, Trigger } from "../../../../types/variables";
 import { OutputDataType, VariableCategory } from "../../../../shared/variable-constants";
 
 import currencyAccess from "../../../currency/currency-access";
@@ -18,7 +18,8 @@ const model : ReplaceVariable = {
         categories: [VariableCategory.USER, VariableCategory.NUMBERS],
         possibleDataOutput: [OutputDataType.NUMBER]
     },
-    evaluator: async (_, currencyName: string, username: string) => {
+    evaluator: async (trigger: Trigger, currencyName: string, username?: string) => {
+        username ??= trigger.metadata.username;
         if (currencyName == null || username == null) {
             return 0;
         }