12.34.0

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (German)

CHANGELOG.md

@@ -1,6 +1,21 @@
 ChangeLog
 =========
 
+12.34.0 (2020/4/17)
+-------------------
+### ✨Improvements
+* Pagesでrectメソッドを追加
+* AiScriptのバージョンアップ
+
+12.33.0 (2020/4/16)
+-------------------
+### ✨Improvements
+* Pagesで円を書くメソッドを追加
+* AiScriptのバージョンアップ
+
+### 🐛Fixes
+* PagesでAiScript変数があると編集が機能しなくなる問題を修正
+
 12.32.0 (2020/4/16)
 -------------------
 ### ✨Improvements

locales/de-DE.yml

@@ -343,7 +343,7 @@ administrator: "Administrator"
 token: "Token"
 twoStepAuthentication: "Zwei-Faktor-Authentifizierung"
 moderator: "Moderator"
-nUsersMentioned: "{n} Benutzer erwähnt"
+nUsersMentioned: "{n} Benutzer reden darüber"
 securityKey: "Sicherheitsschlüssel"
 securityKeyName: "Schlüsselname"
 registerSecurityKey: "Sicherheitsschlüssel registrieren"
@@ -770,6 +770,11 @@ _pages:
       name: "Variablenname"
       text: "Titel"
       default: "Standardwert"
+    canvas: "Leinwand"
+    _canvas:
+      id: "Leinwand-ID"
+      width: "Breite"
+      height: "Höhe"
     switch: "Fallunterscheidung"
     _switch:
       name: "Variablenname"

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "misskey",
 	"author": "syuilo <syuilotan@yahoo.co.jp>",
-	"version": "12.32.0",
+	"version": "12.34.0",
 	"codename": "indigo",
 	"repository": {
 		"type": "git",
@@ -42,7 +42,7 @@
 		"@koa/cors": "3.0.0",
 		"@koa/multer": "2.0.2",
 		"@koa/router": "8.0.8",
-		"@syuilo/aiscript": "0.3.0",
+		"@syuilo/aiscript": "0.3.2",
 		"@types/bcryptjs": "2.4.2",
 		"@types/bull": "3.12.1",
 		"@types/cbor": "5.0.0",

src/client/components/reactions-viewer.reaction.vue

@@ -157,6 +157,10 @@ export default Vue.extend({
 	&.reacted {
 		background: var(--accent);
 
+		&:hover {
+			background: var(--accent);
+		}
+
 		> span {
 			color: #fff;
 		}

src/client/pages/page-editor/els/page-editor.el.if.vue

@@ -2,7 +2,7 @@
 <x-container @remove="() => $emit('remove')" :draggable="true">
 	<template #header><fa :icon="faQuestion"/> {{ $t('_pages.blocks.if') }}</template>
 	<template #func>
-		<button @click="add()">
+		<button @click="add()" class="_button">
 			<fa :icon="faPlus"/>
 		</button>
 	</template>

src/client/pages/page-editor/els/page-editor.el.section.vue

@@ -2,10 +2,10 @@
 <x-container @remove="() => $emit('remove')" :draggable="true">
 	<template #header><fa :icon="faStickyNote"/> {{ value.title }}</template>
 	<template #func>
-		<button @click="rename()">
+		<button @click="rename()" class="_button">
 			<fa :icon="faPencilAlt"/>
 		</button>
-		<button @click="add()">
+		<button @click="add()" class="_button">
 			<fa :icon="faPlus"/>
 		</button>
 	</template>

src/client/pages/page-editor/page-editor.container.vue

@@ -18,7 +18,7 @@
 	</header>
 	<p v-show="showBody" class="error" v-if="error != null">{{ $t('_pages.script.typeError', { slot: error.arg + 1, expect: $t(`script.types.${error.expect}`), actual: $t(`script.types.${error.actual}`) }) }}</p>
 	<p v-show="showBody" class="warn" v-if="warn != null">{{ $t('_pages.script.thereIsEmptySlot', { slot: warn.slot + 1 }) }}</p>
-	<div v-show="showBody">
+	<div v-show="showBody" class="body">
 		<slot></slot>
 	</div>
 </div>
@@ -148,5 +148,17 @@ export default Vue.extend({
 		padding: 16px 16px 0 16px;
 		font-size: 14px;
 	}
+
+	> .body {
+		::v-deep .juejbjww, ::v-deep .eiipwacr {
+			&:not(.inline):first-child {
+				margin-top: 28px;
+			}
+
+			&:not(.inline):last-child {
+				margin-bottom: 20px;
+			}
+		}
+	}
 }
 </style>

src/client/pages/page-editor/page-editor.vue

@@ -86,7 +86,7 @@
 import Vue from 'vue';
 import * as XDraggable from 'vuedraggable';
 import "prismjs";
-import "prismjs/themes/prism.css";
+import 'prismjs/themes/prism-okaidia.css';
 import PrismEditor from 'vue-prism-editor';
 import { faICursor, faPlus, faMagic, faCog, faCode, faExternalLinkSquareAlt } from '@fortawesome/free-solid-svg-icons';
 import { faSave, faStickyNote, faTrashAlt } from '@fortawesome/free-regular-svg-icons';

src/client/pages/page.vue

@@ -118,7 +118,8 @@ export default Vue.extend({
 
 <style lang="scss" scoped>
 .xcukqgmh {
-	> ._card > .banner {
+	> ._card {
+		> .banner {
 			> img {
 				display: block;
 				width: 100%;
@@ -126,5 +127,12 @@ export default Vue.extend({
 				object-fit: cover;
 			}
 		}
+
+		> ._footer {
+			> * {
+				margin: 0 0.5em;
+			}
+		}
+	}
 }
 </style>

src/client/pages/scratchpad.vue

@@ -25,7 +25,7 @@
 import Vue from 'vue';
 import { faTerminal, faPlay } from '@fortawesome/free-solid-svg-icons';
 import "prismjs";
-import "prismjs/themes/prism.css";
+import 'prismjs/themes/prism-okaidia.css';
 import PrismEditor from 'vue-prism-editor';
 import { AiScript, parse, utils, values } from '@syuilo/aiscript';
 import i18n from '../i18n';

src/client/scripts/aoiscript/evaluator.ts

@@ -56,6 +56,8 @@ export class ASEvaluator {
 						['close_path', values.FN_NATIVE(() => { ctx.closePath() })],
 						['move_to', values.FN_NATIVE(([x, y]) => { ctx.moveTo(x.value, y.value) })],
 						['line_to', values.FN_NATIVE(([x, y]) => { ctx.lineTo(x.value, y.value) })],
+						['arc', values.FN_NATIVE(([x, y, radius, startAngle, endAngle]) => { ctx.arc(x.value, y.value, radius.value, startAngle.value, endAngle.value) })],
+						['rect', values.FN_NATIVE(([x, y, width, height]) => { ctx.rect(x.value, y.value, width.value, height.value) })],
 						['fill', values.FN_NATIVE(() => { ctx.fill() })],
 						['stroke', values.FN_NATIVE(() => { ctx.stroke() })],
 					]));
@@ -76,7 +78,6 @@ export class ASEvaluator {
 				},
 				log: (type, params) => {
 				},
-				maxStep: 16384
 			});
 		}
 

src/client/scripts/aoiscript/type-checker.ts

@@ -110,6 +110,7 @@ export class ASTypeChecker {
 
 			return null;
 		}
+		if (v.type === 'aiScriptVar') return null;
 		if (v.type === 'fn') return null; // todo
 		if (v.type.startsWith('fn:')) return null; // todo
 

yarn.lock

@@ -144,10 +144,10 @@
   dependencies:
     type-detect "4.0.8"
 
-"@syuilo/aiscript@0.3.0":
+"@syuilo/aiscript@0.3.2":
-  version "0.3.0"
+  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/@syuilo/aiscript/-/aiscript-0.3.0.tgz#cb0645df40ae97a54eb7e318abef2ccb8045aa14"
+  resolved "https://registry.yarnpkg.com/@syuilo/aiscript/-/aiscript-0.3.2.tgz#c22f745ded968f24279fbce2d717a20db1e70359"
-  integrity sha512-jjtcFqnp5ryzAU3mxP25YJEJH/FmIrMycnFwSer/q1BVsAIqHOIhnRTWjxjVI3n1YHIO5DSD4yG/Em6I3bxJow==
+  integrity sha512-fKA0dq7yKq2HpbDTjn61sbqMuD+ArD7J/HZXtL/0BHVWL6WnzXDbWOW/jxyABvEksmOsJbMf2LHmsikDwE612w==
   dependencies:
     "@types/seedrandom" "2.4.28"
     autobind-decorator "2.4.0"