From 624ee76e71b0539cb24436d1e00c3745574147b0 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Mon, 29 Apr 2019 11:00:41 +0900
Subject: Fix bug

---
 src/client/app/common/scripts/aiscript.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/client/app/common/scripts/aiscript.ts b/src/client/app/common/scripts/aiscript.ts
index 4ef21f9943..aea89ff9a3 100644
--- a/src/client/app/common/scripts/aiscript.ts
+++ b/src/client/app/common/scripts/aiscript.ts
@@ -445,7 +445,7 @@ export class AiScript {
 		}
 
 		if (AiScript.envVarsDef[name]) {
-			return this.envVars[name].value;
+			return this.envVars[name];
 		}
 
 		throw new Error(`Script: No such variable '${name}'`);
-- 
cgit v1.2.3-freya


From e86d0007c6af95230694c73f2f84280ed58f0e99 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Mon, 29 Apr 2019 11:03:05 +0900
Subject: Fix error

---
 src/client/app/desktop/views/components/ui.header.account.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/client/app/desktop/views/components/ui.header.account.vue b/src/client/app/desktop/views/components/ui.header.account.vue
index 05692667b7..9b87e0c29f 100644
--- a/src/client/app/desktop/views/components/ui.header.account.vue
+++ b/src/client/app/desktop/views/components/ui.header.account.vue
@@ -35,7 +35,7 @@
 						<i><fa icon="angle-right"/></i>
 					</p>
 				</li>
-				<li @click="page">
+				<li>
 					<router-link to="/i/pages">
 						<i><fa :icon="faStickyNote" fixed-width/></i>
 						<span>{{ $t('@.pages') }}</span>
-- 
cgit v1.2.3-freya


From c886c09cdb2878f2b0e53939f7afce9eab71e44f Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Mon, 29 Apr 2019 11:08:35 +0900
Subject: MisskeyPagesで値が0の変数が表示されない問題を修正
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/client/app/common/scripts/aiscript.ts       | 6 ++++--
 src/client/app/common/views/pages/page/page.vue | 7 +++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/client/app/common/scripts/aiscript.ts b/src/client/app/common/scripts/aiscript.ts
index aea89ff9a3..a3e499fc88 100644
--- a/src/client/app/common/scripts/aiscript.ts
+++ b/src/client/app/common/scripts/aiscript.ts
@@ -316,8 +316,10 @@ export class AiScript {
 
 	@autobind
 	private interpolate(str: string, values: { name: string, value: any }[]) {
-		return str.replace(/\{(.+?)\}/g, match =>
-			(this.getVariableValue(match.slice(1, -1).trim(), values) || '').toString());
+		return str.replace(/\{(.+?)\}/g, match => {
+			const v = this.getVariableValue(match.slice(1, -1).trim(), values);
+			return v == null ? 'NULL' : v.toString();
+		});
 	}
 
 	@autobind
diff --git a/src/client/app/common/views/pages/page/page.vue b/src/client/app/common/views/pages/page/page.vue
index 5ca58a6a4e..307ddf8db7 100644
--- a/src/client/app/common/views/pages/page/page.vue
+++ b/src/client/app/common/views/pages/page/page.vue
@@ -31,6 +31,7 @@ class Script {
 	constructor(aiScript) {
 		this.aiScript = aiScript;
 		this.vars = this.aiScript.evaluateVars();
+		console.log(this.vars);
 	}
 
 	public reEval() {
@@ -38,8 +39,10 @@ class Script {
 	}
 
 	public interpolate(str: string) {
-		return str.replace(/\{(.+?)\}/g, match =>
-			(this.vars.find(x => x.name === match.slice(1, -1).trim()).value || '').toString());
+		return str.replace(/\{(.+?)\}/g, match => {
+			const v = this.vars.find(x => x.name === match.slice(1, -1).trim()).value;
+			return v == null ? 'NULL' : v.toString();
+		});
 	}
 }
 
-- 
cgit v1.2.3-freya


From 0d64a17d86e31c174f1cb3fcabdda05615115300 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Mon, 29 Apr 2019 11:10:50 +0900
Subject: Update page.vue

---
 src/client/app/common/views/pages/page/page.vue | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src')

diff --git a/src/client/app/common/views/pages/page/page.vue b/src/client/app/common/views/pages/page/page.vue
index 307ddf8db7..e7e8f76d53 100644
--- a/src/client/app/common/views/pages/page/page.vue
+++ b/src/client/app/common/views/pages/page/page.vue
@@ -31,7 +31,6 @@ class Script {
 	constructor(aiScript) {
 		this.aiScript = aiScript;
 		this.vars = this.aiScript.evaluateVars();
-		console.log(this.vars);
 	}
 
 	public reEval() {
-- 
cgit v1.2.3-freya