Merge branch 'develop'

9 files changed, 29 insertions, 4 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7783896256..b2b0b1dda4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,14 @@ npm i -g ts-node
 npm run migrate
 ```
 
+11.24.2 (2019/07/05)
+--------------------
+### 🐛Fixes
+* チャートAPIの返り値が文字列になっていることがある問題を修正
+* チャートに数字が表示される問題を修正
+* ペタバイト単位が表示できない問題を修正
+* SingleLineなMFMが折り返されてしまう問題を修正
+
 11.24.1 (2019/07/05)
 --------------------
 ### 🐛Fixes
diff --git a/package.json b/package.json
index e5d2806998..b113b8f7c3 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "11.24.1",
+	"version": "11.24.2",
 	"codename": "daybreak",
 	"repository": {
 		"type": "git",
diff --git a/src/client/app/common/views/components/activity.vue b/src/client/app/common/views/components/activity.vue
index 395d764fb8..a958616943 100644
--- a/src/client/app/common/views/components/activity.vue
+++ b/src/client/app/common/views/components/activity.vue
@@ -72,6 +72,9 @@ export default Vue.extend({
 						columnWidth: '80%'
 					}
 				},
+				dataLabels: {
+					enabled: false
+				},
 				grid: {
 					clipMarkers: false,
 					padding: {
diff --git a/src/client/app/common/views/components/misskey-flavored-markdown.vue b/src/client/app/common/views/components/misskey-flavored-markdown.vue
index fa24f6dfa4..a0ecbecbb2 100644
--- a/src/client/app/common/views/components/misskey-flavored-markdown.vue
+++ b/src/client/app/common/views/components/misskey-flavored-markdown.vue
@@ -1,5 +1,5 @@
 <template>
-<mfm-core v-bind="$attrs" class="havbbuyv" v-once/>
+<mfm-core v-bind="$attrs" class="havbbuyv" :class="{ plain: $attrs['plain-text'] }" v-once/>
 </template>
 
 <script lang="ts">
@@ -17,6 +17,9 @@ export default Vue.extend({
 .havbbuyv
 	white-space pre-wrap
 
+	&.plain
+		white-space pre
+
 	>>> .title
 		display block
 		margin-bottom 4px
diff --git a/src/client/app/common/views/deck/deck.hashtag-column.vue b/src/client/app/common/views/deck/deck.hashtag-column.vue
index 1af1632581..0d719c2199 100644
--- a/src/client/app/common/views/deck/deck.hashtag-column.vue
+++ b/src/client/app/common/views/deck/deck.hashtag-column.vue
@@ -73,6 +73,9 @@ export default Vue.extend({
 							enabled: true
 						},
 					},
+					dataLabels: {
+						enabled: false
+					},
 					grid: {
 						clipMarkers: false,
 						padding: {
diff --git a/src/client/app/common/views/deck/deck.user-column.home.vue b/src/client/app/common/views/deck/deck.user-column.home.vue
index 49cc869eb9..56b117a7dd 100644
--- a/src/client/app/common/views/deck/deck.user-column.home.vue
+++ b/src/client/app/common/views/deck/deck.user-column.home.vue
@@ -163,6 +163,9 @@ export default Vue.extend({
 							columnWidth: '80%'
 						}
 					},
+					dataLabels: {
+						enabled: false
+					},
 					grid: {
 						clipMarkers: false,
 						padding: {
diff --git a/src/client/app/common/views/filters/bytes.ts b/src/client/app/common/views/filters/bytes.ts
index 5b5d966cfd..227ccae3a4 100644
--- a/src/client/app/common/views/filters/bytes.ts
+++ b/src/client/app/common/views/filters/bytes.ts
@@ -2,7 +2,7 @@ import Vue from 'vue';
 
 Vue.filter('bytes', (v, digits = 0) => {
 	if (v == null) return '?';
-	const sizes = ['B', 'KB', 'MB', 'GB', 'TB'];
+	const sizes = ['B', 'KB', 'MB', 'GB', 'TB', 'PB'];
 	if (v == 0) return '0';
 	const isMinus = v < 0;
 	if (isMinus) v = -v;
diff --git a/src/client/app/common/views/widgets/queue.vue b/src/client/app/common/views/widgets/queue.vue
index 27ba35fbcd..6e49f1efb0 100644
--- a/src/client/app/common/views/widgets/queue.vue
+++ b/src/client/app/common/views/widgets/queue.vue
@@ -90,6 +90,9 @@ export default define({
 					enabled: true,
 				}
 			},
+			dataLabels: {
+				enabled: false
+			},
 			tooltip: {
 				enabled: false
 			},
diff --git a/src/services/chart/core.ts b/src/services/chart/core.ts
index d5fd9a5c5c..a3bd80d16b 100644
--- a/src/services/chart/core.ts
+++ b/src/services/chart/core.ts
@@ -446,7 +446,9 @@ export default abstract class Chart<T extends Record<string, any>> {
 				if (typeof v == 'object') {
 					dive(v, p);
 				} else {
-					nestedProperty.set(res, p, chart.map(s => nestedProperty.get(s, p)));
+					const values = chart.map(s => nestedProperty.get(s, p))
+						.map(v => parseInt(v, 10)); // TypeORMのバグ(？)で何故か数値カラムの値が文字列型になっているので数値に戻す
+					nestedProperty.set(res, p, values);
 				}
 			}
 		};