Fix: Pages - vars {} -> ${}

sakura-tel · Jan 13, 2023 · 078250d · 078250d
1 parent ac96df6
commit 078250d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/client/app/common/views/components/page/page.vue b/src/client/app/common/views/components/page/page.vue
@@ -58,8 +58,8 @@ class Script {
 
 	public interpolate(str: string) {
 		if (str == null) return null;
-		return str.replace(/${(.+?)}/g, match => {
-			const v = this.vars[match.slice(1, -1).trim()];
+		return str.replace(/\${(.+?)}/g, match => {
+			const v = this.vars[match.slice(2, -1).trim()];
 			return v == null ? 'NULL' : v.toString();
 		});
 	}

diff --git a/src/misc/aiscript/evaluator.ts b/src/misc/aiscript/evaluator.ts
@@ -65,8 +65,8 @@ export class ASEvaluator {
 
 	@autobind
 	private interpolate(str: string, scope: Scope) {
-		return str.replace(/${(.+?)}/g, match => {
-			const v = scope.getState(match.slice(1, -1).trim());
+		return str.replace(/\${(.+?)}/g, match => {
+			const v = scope.getState(match.slice(2, -1).trim());
 			return v == null ? 'NULL' : v.toString();
 		});
 	}