Merge branch 'develop'

CHANGELOG.md

@@ -42,6 +42,12 @@ mongodb:
 8. master ブランチに戻す
 9. enjoy
 
+11.5.1 (2019/04/29)
+-------------------
+### Fixes
+* MisskeyPagesで環境変数を別の変数内で使えない問題を修正
+* MisskeyPagesで値が0の変数が表示されない問題を修正
+
 11.5.0 (2019/04/29)
 -------------------
 ### 注意

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "11.5.0",
+	"version": "11.5.1",
 	"codename": "daybreak",
 	"repository": {
 		"type": "git",

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
@@ -445,7 +447,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}'`);

src/client/app/common/views/pages/page/page.vue

@@ -38,8 +38,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();
+		});
 	}
 }
 

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>