Merge branch 'develop'

CHANGELOG.md

@@ -7,6 +7,14 @@
 
 -->
 
+## 12.99.3 (2021/12/14)
+### Bugfixes
+- クライアント: オートコンプリートがダイアログの裏に隠れる問題を修正
+
+## 12.99.2 (2021/12/14)
+
+## 12.99.1 (2021/12/14)
+
 ## 12.99.0 (2021/12/14)
 
 ### Improvements

locales/index.js

@@ -46,7 +46,10 @@ const primaries = {
 	'zh': 'CN',
 };
 
-const locales = languages.reduce((a, c) => (a[c] = yaml.load(fs.readFileSync(`${__dirname}/${c}.yml`, 'utf-8')) || {}, a), {});
+// 何故か文字列にバックスペース文字が混入することがあり、YAMLが壊れるので取り除く
+const clean = (text) => text.replace(new RegExp(String.fromCodePoint(0x08), 'g'), '');
+
+const locales = languages.reduce((a, c) => (a[c] = yaml.load(clean(fs.readFileSync(`${__dirname}/${c}.yml`, 'utf-8'))) || {}, a), {});
 
 module.exports = Object.entries(locales)
 	.reduce((a, [k ,v]) => (a[k] = (() => {

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "12.99.0",
+	"version": "12.99.3",
 	"codename": "indigo",
 	"repository": {
 		"type": "git",

packages/backend/migration/1639325650583-chart-v3.js

@@ -4,6 +4,8 @@ module.exports = class chartV31639325650583 {
     name = 'chartV31639325650583'
 
     async up(queryRunner) {
+			await queryRunner.query(`DELETE FROM "__chart__per_user_drive" WHERE "group" IS NULL`);
+
         await queryRunner.query(`DROP INDEX "public"."IDX_dd907becf76104e4b656659e6b"`);
         await queryRunner.query(`DROP INDEX "public"."IDX_eddfed8fb40305a04c6f941050"`);
         await queryRunner.query(`DROP INDEX "public"."IDX_f09d543e3acb16c5976bdb31fa"`);

packages/client/src/components/autocomplete.vue

@@ -1,5 +1,5 @@
 <template>
-<div class="swhvrteh _popup _shadow" @contextmenu.prevent="() => {}">
+<div class="swhvrteh _popup _shadow" :style="{ zIndex }" @contextmenu.prevent="() => {}">
 	<ol v-if="type === 'user'" ref="suggests" class="users">
 		<li v-for="user in users" tabindex="-1" class="user" @click="complete(type, user)" @keydown="onKeydown">
 			<img class="avatar" :src="user.avatarUrl"/>
@@ -157,6 +157,7 @@ export default defineComponent({
 			items: [],
 			mfmTags: [],
 			select: -1,
+			zIndex: os.claimZIndex(true),
 		}
 	},
 
@@ -403,7 +404,6 @@ export default defineComponent({
 <style lang="scss" scoped>
 .swhvrteh {
 	position: fixed;
-	z-index: 65535;
 	max-width: 100%;
 	margin-top: calc(1em + 8px);
 	overflow: hidden;