From 5d01cbd81c28c6c82ad97dfc9012834c346eac64 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 18 Dec 2021 12:12:47 +0900
Subject: [PATCH 01/13] fix(client): fix zindex issue

Fix #8064
Fix #8063
---
 .../client/src/components/autocomplete.vue     |  2 +-
 packages/client/src/components/dialog.vue      |  2 +-
 .../src/components/emoji-picker-dialog.vue     |  2 +-
 .../client/src/components/image-viewer.vue     |  2 +-
 packages/client/src/components/toast.vue       |  2 +-
 .../client/src/components/ui/context-menu.vue  |  9 +++++++--
 packages/client/src/components/ui/modal.vue    |  8 ++++----
 .../client/src/components/ui/popup-menu.vue    |  2 +-
 packages/client/src/components/ui/tooltip.vue  |  2 +-
 packages/client/src/components/ui/window.vue   |  2 +-
 packages/client/src/components/updated.vue     |  2 +-
 .../src/components/visibility-picker.vue       |  2 +-
 .../client/src/components/waiting-dialog.vue   |  2 +-
 packages/client/src/os.ts                      | 18 ++++++++----------
 packages/client/src/ui/_common_/common.vue     |  2 +-
 packages/client/src/ui/_common_/upload.vue     |  2 +-
 16 files changed, 32 insertions(+), 29 deletions(-)

diff --git a/packages/client/src/components/autocomplete.vue b/packages/client/src/components/autocomplete.vue
index c50f032a5..30be2ac74 100644
--- a/packages/client/src/components/autocomplete.vue
+++ b/packages/client/src/components/autocomplete.vue
@@ -157,7 +157,7 @@ export default defineComponent({
 			items: [],
 			mfmTags: [],
 			select: -1,
-			zIndex: os.claimZIndex(true),
+			zIndex: os.claimZIndex('high'),
 		}
 	},
 
diff --git a/packages/client/src/components/dialog.vue b/packages/client/src/components/dialog.vue
index 90cac9b5e..c2fa1b02b 100644
--- a/packages/client/src/components/dialog.vue
+++ b/packages/client/src/components/dialog.vue
@@ -1,5 +1,5 @@
 <template>
-<MkModal ref="modal" :prefer-type="'dialog'" :front="true" @click="done(true)" @closed="$emit('closed')">
+<MkModal ref="modal" :prefer-type="'dialog'" :z-priority="'high'" @click="done(true)" @closed="$emit('closed')">
 	<div class="mk-dialog">
 		<div v-if="icon" class="icon">
 			<i :class="icon"></i>
diff --git a/packages/client/src/components/emoji-picker-dialog.vue b/packages/client/src/components/emoji-picker-dialog.vue
index d2a405ef5..51c634dd8 100644
--- a/packages/client/src/components/emoji-picker-dialog.vue
+++ b/packages/client/src/components/emoji-picker-dialog.vue
@@ -1,5 +1,5 @@
 <template>
-<MkModal ref="modal" v-slot="{ type, maxHeight }" :prefer-type="asReactionPicker && $store.state.reactionPickerUseDrawerForMobile === false ? 'popup' : 'auto'" :transparent-bg="true" :manual-showing="manualShowing" :src="src" :front="true" @click="$refs.modal.close()" @opening="opening" @close="$emit('close')" @closed="$emit('closed')">
+<MkModal ref="modal" v-slot="{ type, maxHeight }" :z-priority="'middle'" :prefer-type="asReactionPicker && $store.state.reactionPickerUseDrawerForMobile === false ? 'popup' : 'auto'" :transparent-bg="true" :manual-showing="manualShowing" :src="src" @click="$refs.modal.close()" @opening="opening" @close="$emit('close')" @closed="$emit('closed')">
 	<MkEmojiPicker ref="picker" class="ryghynhb _popup _shadow" :class="{ drawer: type === 'drawer' }" :show-pinned="showPinned" :as-reaction-picker="asReactionPicker" :as-drawer="type === 'drawer'" :max-height="maxHeight" @chosen="chosen"/>
 </MkModal>
 </template>
diff --git a/packages/client/src/components/image-viewer.vue b/packages/client/src/components/image-viewer.vue
index fc28c30b5..8584b91a6 100644
--- a/packages/client/src/components/image-viewer.vue
+++ b/packages/client/src/components/image-viewer.vue
@@ -1,5 +1,5 @@
 <template>
-<MkModal ref="modal" @click="$refs.modal.close()" @closed="$emit('closed')">
+<MkModal ref="modal" :z-priority="'middle'" @click="$refs.modal.close()" @closed="$emit('closed')">
 	<div class="xubzgfga">
 		<header>{{ image.name }}</header>
 		<img :src="image.url" :alt="image.comment" :title="image.comment" @click="$refs.modal.close()"/>
diff --git a/packages/client/src/components/toast.vue b/packages/client/src/components/toast.vue
index 6561ba385..02b61e5be 100644
--- a/packages/client/src/components/toast.vue
+++ b/packages/client/src/components/toast.vue
@@ -25,7 +25,7 @@ export default defineComponent({
 	data() {
 		return {
 			showing: true,
-			zIndex: os.claimZIndex(true),
+			zIndex: os.claimZIndex('high'),
 		};
 	},
 	mounted() {
diff --git a/packages/client/src/components/ui/context-menu.vue b/packages/client/src/components/ui/context-menu.vue
index 0438d3323..85606bf6d 100644
--- a/packages/client/src/components/ui/context-menu.vue
+++ b/packages/client/src/components/ui/context-menu.vue
@@ -1,6 +1,6 @@
 <template>
 <transition :name="$store.state.animation ? 'fade' : ''" appear>
-	<div class="nvlagfpb" @contextmenu.prevent.stop="() => {}">
+	<div class="nvlagfpb" :style="{ zIndex }" @contextmenu.prevent.stop="() => {}">
 		<MkMenu :items="items" class="_popup _shadow" :align="'left'" @close="$emit('closed')"/>
 	</div>
 </transition>
@@ -10,6 +10,7 @@
 import { defineComponent } from 'vue';
 import contains from '@/scripts/contains';
 import MkMenu from './menu.vue';
+import * as os from '@/os';
 
 export default defineComponent({
 	components: {
@@ -29,6 +30,11 @@ export default defineComponent({
 		},
 	},
 	emits: ['closed'],
+	data() {
+		return {
+			zIndex: os.claimZIndex('high'),
+		};
+	},
 	computed: {
 		keymap(): any {
 			return {
@@ -82,7 +88,6 @@ export default defineComponent({
 <style lang="scss" scoped>
 .nvlagfpb {
 	position: absolute;
-	z-index: 65535;
 }
 
 .fade-enter-active, .fade-leave-active {
diff --git a/packages/client/src/components/ui/modal.vue b/packages/client/src/components/ui/modal.vue
index 81394be63..b09d04c45 100644
--- a/packages/client/src/components/ui/modal.vue
+++ b/packages/client/src/components/ui/modal.vue
@@ -49,10 +49,10 @@ export default defineComponent({
 			type: String,
 			default: 'auto',
 		},
-		front: {
-			type: Boolean,
+		zPriority: {
+			type: String as PropType<'low' | 'middle' | 'high'>,
 			required: false,
-			default: false,
+			default: 'low',
 		},
 		noOverlap: {
 			type: Boolean,
@@ -74,7 +74,7 @@ export default defineComponent({
 		const transformOrigin = ref('center');
 		const showing = ref(true);
 		const content = ref<HTMLElement>();
-		const zIndex = os.claimZIndex(props.front);
+		const zIndex = os.claimZIndex(props.zPriority);
 		const type = computed(() => {
 			if (props.preferType === 'auto') {
 				if (isTouchUsing && window.innerWidth < 500 && window.innerHeight < 1000) {
diff --git a/packages/client/src/components/ui/popup-menu.vue b/packages/client/src/components/ui/popup-menu.vue
index f1eedcc62..8ffc4ad19 100644
--- a/packages/client/src/components/ui/popup-menu.vue
+++ b/packages/client/src/components/ui/popup-menu.vue
@@ -1,5 +1,5 @@
 <template>
-<MkModal ref="modal" v-slot="{ type, maxHeight }" :src="src" :transparent-bg="true" @click="$refs.modal.close()" @closed="$emit('closed')">
+<MkModal ref="modal" v-slot="{ type, maxHeight }" :z-priority="'high'" :src="src" :transparent-bg="true" @click="$refs.modal.close()" @closed="$emit('closed')">
 	<MkMenu :items="items" :align="align" :width="width" :max-height="maxHeight" :as-drawer="type === 'drawer'" class="sfhdhdhq _popup _shadow" :class="{ drawer: type === 'drawer' }" @close="$refs.modal.close()"/>
 </MkModal>
 </template>
diff --git a/packages/client/src/components/ui/tooltip.vue b/packages/client/src/components/ui/tooltip.vue
index 90326a0ff..2e48ab623 100644
--- a/packages/client/src/components/ui/tooltip.vue
+++ b/packages/client/src/components/ui/tooltip.vue
@@ -34,7 +34,7 @@ export default defineComponent({
 
 	setup(props, context) {
 		const el = ref<HTMLElement>();
-		const zIndex = os.claimZIndex(true);
+		const zIndex = os.claimZIndex('high');
 
 		const setPosition = () => {
 			if (el.value == null) return;
diff --git a/packages/client/src/components/ui/window.vue b/packages/client/src/components/ui/window.vue
index 265d86acd..d01498d8d 100644
--- a/packages/client/src/components/ui/window.vue
+++ b/packages/client/src/components/ui/window.vue
@@ -155,7 +155,7 @@ export default defineComponent({
 
 		// 最前面へ移動
 		top() {
-			(this.$el as any).style.zIndex = os.claimZIndex(this.front);
+			(this.$el as any).style.zIndex = os.claimZIndex(this.front ? 'middle' : 'low');
 		},
 
 		onBodyMousedown() {
diff --git a/packages/client/src/components/updated.vue b/packages/client/src/components/updated.vue
index c021c6066..74f54524b 100644
--- a/packages/client/src/components/updated.vue
+++ b/packages/client/src/components/updated.vue
@@ -1,5 +1,5 @@
 <template>
-<MkModal ref="modal" @click="$refs.modal.close()" @closed="$emit('closed')">
+<MkModal ref="modal" :z-priority="'middle'" @click="$refs.modal.close()" @closed="$emit('closed')">
 	<div class="ewlycnyt">
 		<div class="title">{{ $ts.misskeyUpdated }}</div>
 		<div class="version">✨{{ version }}🚀</div>
diff --git a/packages/client/src/components/visibility-picker.vue b/packages/client/src/components/visibility-picker.vue
index c75202d95..4200f4354 100644
--- a/packages/client/src/components/visibility-picker.vue
+++ b/packages/client/src/components/visibility-picker.vue
@@ -1,5 +1,5 @@
 <template>
-<MkModal ref="modal" :src="src" @click="$refs.modal.close()" @closed="$emit('closed')">
+<MkModal ref="modal" :z-priority="'high'" :src="src" @click="$refs.modal.close()" @closed="$emit('closed')">
 	<div class="gqyayizv _popup">
 		<button key="public" class="_button" :class="{ active: v == 'public' }" data-index="1" @click="choose('public')">
 			<div><i class="fas fa-globe"></i></div>
diff --git a/packages/client/src/components/waiting-dialog.vue b/packages/client/src/components/waiting-dialog.vue
index e9ca3b33b..10aedbd8f 100644
--- a/packages/client/src/components/waiting-dialog.vue
+++ b/packages/client/src/components/waiting-dialog.vue
@@ -1,5 +1,5 @@
 <template>
-<MkModal ref="modal" :prefer-type="'dialog'" @click="success ? done() : () => {}" @closed="$emit('closed')">
+<MkModal ref="modal" :prefer-type="'dialog'" :z-priority="'high'" @click="success ? done() : () => {}" @closed="$emit('closed')">
 	<div class="iuyakobc" :class="{ iconOnly: (text == null) || success }">
 		<i v-if="success" class="fas fa-check icon success"></i>
 		<i v-else class="fas fa-spinner fa-pulse icon waiting"></i>
diff --git a/packages/client/src/os.ts b/packages/client/src/os.ts
index 404fe24d8..b2acdcd6e 100644
--- a/packages/client/src/os.ts
+++ b/packages/client/src/os.ts
@@ -162,16 +162,14 @@ export const popups = ref([]) as Ref<{
 	props: Record<string, any>;
 }[]>;
 
-let popupZIndex = 1000000;
-let popupZIndexForFront = 2000000;
-export function claimZIndex(front = false): number {
-	if (front) {
-		popupZIndexForFront += 100;
-		return popupZIndexForFront;
-	} else {
-		popupZIndex += 100;
-		return popupZIndex;
-	}
+const zIndexes = {
+	low: 1000000,
+	middle: 2000000,
+	high: 3000000,
+};
+export function claimZIndex(priority: 'low' | 'middle' | 'high'): number {
+	zIndexes[priority] += 100;
+	return zIndexes[priority];
 }
 
 export async function popup(component: Component | typeof import('*.vue') | Promise<Component | typeof import('*.vue')>, props: Record<string, any>, events = {}, disposeEvent?: string) {
diff --git a/packages/client/src/ui/_common_/common.vue b/packages/client/src/ui/_common_/common.vue
index 4f93cf5e7..68f5f779f 100644
--- a/packages/client/src/ui/_common_/common.vue
+++ b/packages/client/src/ui/_common_/common.vue
@@ -60,7 +60,7 @@ export default defineComponent({
 #wait {
 	display: block;
 	position: fixed;
-	z-index: 3000000;
+	z-index: 4000000;
 	top: 15px;
 	right: 15px;
 
diff --git a/packages/client/src/ui/_common_/upload.vue b/packages/client/src/ui/_common_/upload.vue
index 09d1529e7..a1c5dcdec 100644
--- a/packages/client/src/ui/_common_/upload.vue
+++ b/packages/client/src/ui/_common_/upload.vue
@@ -25,7 +25,7 @@ export default defineComponent({
 	data() {
 		return {
 			uploads: os.uploads,
-			zIndex: os.claimZIndex(true),
+			zIndex: os.claimZIndex('high'),
 		};
 	},
 });

From a4b05e195a7871aea0d20b4bbbfbdb4ddd7151fe Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 18 Dec 2021 12:14:27 +0900
Subject: [PATCH 02/13] fix(client): fix zindex issue

---
 packages/client/src/components/url-preview-popup.vue | 2 +-
 packages/client/src/components/user-preview.vue      | 2 +-
 packages/client/src/os.ts                            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/client/src/components/url-preview-popup.vue b/packages/client/src/components/url-preview-popup.vue
index 75c5bca7d..c345bafcf 100644
--- a/packages/client/src/components/url-preview-popup.vue
+++ b/packages/client/src/components/url-preview-popup.vue
@@ -35,7 +35,7 @@ export default defineComponent({
 			u: null,
 			top: 0,
 			left: 0,
-			zIndex: os.claimZIndex(),
+			zIndex: os.claimZIndex('middle'),
 		};
 	},
 
diff --git a/packages/client/src/components/user-preview.vue b/packages/client/src/components/user-preview.vue
index 9b3f15b61..f85a32fbe 100644
--- a/packages/client/src/components/user-preview.vue
+++ b/packages/client/src/components/user-preview.vue
@@ -65,7 +65,7 @@ export default defineComponent({
 			fetched: false,
 			top: 0,
 			left: 0,
-			zIndex: os.claimZIndex(),
+			zIndex: os.claimZIndex('middle'),
 		};
 	},
 
diff --git a/packages/client/src/os.ts b/packages/client/src/os.ts
index b2acdcd6e..665151b01 100644
--- a/packages/client/src/os.ts
+++ b/packages/client/src/os.ts
@@ -167,7 +167,7 @@ const zIndexes = {
 	middle: 2000000,
 	high: 3000000,
 };
-export function claimZIndex(priority: 'low' | 'middle' | 'high'): number {
+export function claimZIndex(priority: 'low' | 'middle' | 'high' = 'low'): number {
 	zIndexes[priority] += 100;
 	return zIndexes[priority];
 }

From e03cc6859c6b2aaf407961568966841996908431 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 18 Dec 2021 14:55:53 +0900
Subject: [PATCH 03/13] feat(client): improve toast component and show welcome
 message

---
 locales/ja-JP.yml                             |  1 +
 .../src/components/notification-toast.vue     | 74 +++++++++++++++++++
 packages/client/src/components/toast.vue      | 71 +++++++++---------
 packages/client/src/init.ts                   | 14 +++-
 packages/client/src/os.ts                     |  4 +-
 packages/client/src/ui/_common_/common.vue    |  2 +-
 6 files changed, 126 insertions(+), 40 deletions(-)
 create mode 100644 packages/client/src/components/notification-toast.vue

diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index daac05c66..084fd6448 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -816,6 +816,7 @@ hide: "隠す"
 leaveGroup: "グループから抜ける"
 leaveGroupConfirm: "「{name}」から抜けますか？"
 useDrawerReactionPickerForMobile: "モバイルデバイスのときドロワーで表示"
+welcomeBackWithName: "おかえりなさい、{name}さん"
 
 _emailUnavailable:
   used: "既に使用されています"
diff --git a/packages/client/src/components/notification-toast.vue b/packages/client/src/components/notification-toast.vue
new file mode 100644
index 000000000..5449409cc
--- /dev/null
+++ b/packages/client/src/components/notification-toast.vue
@@ -0,0 +1,74 @@
+<template>
+<div class="mk-notification-toast" :style="{ zIndex }">
+	<transition name="notification-toast" appear @after-leave="$emit('closed')">
+		<XNotification v-if="showing" :notification="notification" class="notification _acrylic"/>
+	</transition>
+</div>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+import XNotification from './notification.vue';
+import * as os from '@/os';
+
+export default defineComponent({
+	components: {
+		XNotification
+	},
+	props: {
+		notification: {
+			type: Object,
+			required: true
+		}
+	},
+	emits: ['closed'],
+	data() {
+		return {
+			showing: true,
+			zIndex: os.claimZIndex('high'),
+		};
+	},
+	mounted() {
+		setTimeout(() => {
+			this.showing = false;
+		}, 6000);
+	}
+});
+</script>
+
+<style lang="scss" scoped>
+.notification-toast-enter-active, .notification-toast-leave-active {
+	transition: opacity 0.3s, transform 0.3s !important;
+}
+.notification-toast-enter-from, .notification-toast-leave-to {
+	opacity: 0;
+	transform: translateX(-250px);
+}
+
+.mk-notification-toast {
+	position: fixed;
+	left: 0;
+	width: 250px;
+	top: 32px;
+	padding: 0 32px;
+	pointer-events: none;
+
+	@media (max-width: 700px) {
+		top: initial;
+		bottom: 112px;
+		padding: 0 16px;
+	}
+
+	@media (max-width: 500px) {
+		bottom: 92px;
+		padding: 0 8px;
+	}
+
+	> .notification {
+		height: 100%;
+		box-shadow: 0 4px 16px rgba(0, 0, 0, 0.3);
+		border-radius: 8px;
+		overflow: hidden;
+	}
+}
+</style>
diff --git a/packages/client/src/components/toast.vue b/packages/client/src/components/toast.vue
index 02b61e5be..d9f0aa5ea 100644
--- a/packages/client/src/components/toast.vue
+++ b/packages/client/src/components/toast.vue
@@ -1,25 +1,25 @@
 <template>
-<div class="mk-toast" :style="{ zIndex }">
-	<transition name="notification-slide" appear @after-leave="$emit('closed')">
-		<XNotification v-if="showing" :notification="notification" class="notification _acrylic"/>
+<div class="mk-toast">
+	<transition name="toast" appear @after-leave="$emit('closed')">
+		<div v-if="showing" class="body _acrylic" :style="{ zIndex }">
+			<div class="message">
+				{{ message }}
+			</div>
+		</div>
 	</transition>
 </div>
 </template>
 
 <script lang="ts">
 import { defineComponent } from 'vue';
-import XNotification from './notification.vue';
 import * as os from '@/os';
 
 export default defineComponent({
-	components: {
-		XNotification
-	},
 	props: {
-		notification: {
-			type: Object,
-			required: true
-		}
+		message: {
+			type: String,
+			required: true,
+		},
 	},
 	emits: ['closed'],
 	data() {
@@ -31,44 +31,41 @@ export default defineComponent({
 	mounted() {
 		setTimeout(() => {
 			this.showing = false;
-		}, 6000);
+		}, 4000);
 	}
 });
 </script>
 
 <style lang="scss" scoped>
-.notification-slide-enter-active, .notification-slide-leave-active {
+.toast-enter-active, .toast-leave-active {
 	transition: opacity 0.3s, transform 0.3s !important;
 }
-.notification-slide-enter-from, .notification-slide-leave-to {
+.toast-enter-from, .toast-leave-to {
 	opacity: 0;
-	transform: translateX(-250px);
+	transform: translateY(calc(0px - (100% - 32px)));
 }
 
 .mk-toast {
-	position: fixed;
-	left: 0;
-	width: 250px;
-	top: 32px;
-	padding: 0 32px;
-	pointer-events: none;
-
-	@media (max-width: 700px) {
-		top: initial;
-		bottom: 112px;
-		padding: 0 16px;
-	}
-
-	@media (max-width: 500px) {
-		bottom: 92px;
-		padding: 0 8px;
-	}
-
-	> .notification {
-		height: 100%;
+	> .body {
+		position: fixed;
+		left: 0;
+		right: 0;
+		top: 0;
+		margin: 0 auto;
+		padding-top: 32px;
+		margin-top: -32px;
+		min-width: 300px;
+		max-width: calc(100% - 32px);
+		width: min-content;
 		box-shadow: 0 4px 16px rgba(0, 0, 0, 0.3);
-		border-radius: 8px;
-		overflow: hidden;
+		border-radius: 0 0 8px 8px;
+		overflow: clip;
+		text-align: center;
+		pointer-events: none;
+
+		> .message {
+			padding: 16px 24px;
+		}
 	}
 }
 </style>
diff --git a/packages/client/src/init.ts b/packages/client/src/init.ts
index f0368cc1d..82a1e169c 100644
--- a/packages/client/src/init.ts
+++ b/packages/client/src/init.ts
@@ -26,7 +26,7 @@ import { router } from '@/router';
 import { applyTheme } from '@/scripts/theme';
 import { isDeviceDarkmode } from '@/scripts/is-device-darkmode';
 import { i18n } from '@/i18n';
-import { stream, confirm, alert, post, popup } from '@/os';
+import { stream, confirm, alert, post, popup, toast } from '@/os';
 import * as sound from '@/scripts/sound';
 import { $i, refreshAccount, login, updateAccount, signout } from '@/account';
 import { defaultStore, ColdDeviceStorage } from '@/store';
@@ -342,6 +342,18 @@ if ($i) {
 		});
 	}
 
+	const lastUsed = localStorage.getItem('lastUsed');
+	if (lastUsed) {
+		const lastUsedDate = parseInt(lastUsed, 10);
+		// 二時間以上前なら
+		if (Date.now() - lastUsedDate > 1000 * 60 * 60 * 2) {
+			toast(i18n.t('welcomeBackWithName', {
+				name: $i.name || $i.username,
+			}));
+		}
+	}
+	localStorage.setItem('lastUsed', Date.now().toString());
+
 	if ('Notification' in window) {
 		// 許可を得ていなかったらリクエスト
 		if (Notification.permission === 'default') {
diff --git a/packages/client/src/os.ts b/packages/client/src/os.ts
index 665151b01..4ed69e0ec 100644
--- a/packages/client/src/os.ts
+++ b/packages/client/src/os.ts
@@ -221,7 +221,9 @@ export function modalPageWindow(path: string) {
 }
 
 export function toast(message: string) {
-	// TODO
+	popup(import('@/components/toast.vue'), {
+		message
+	}, {}, 'closed');
 }
 
 export function alert(props: {
diff --git a/packages/client/src/ui/_common_/common.vue b/packages/client/src/ui/_common_/common.vue
index 68f5f779f..956ec556c 100644
--- a/packages/client/src/ui/_common_/common.vue
+++ b/packages/client/src/ui/_common_/common.vue
@@ -34,7 +34,7 @@ export default defineComponent({
 					id: notification.id
 				});
 
-				popup(import('@/components/toast.vue'), {
+				popup(import('@/components/notification-toast.vue'), {
 					notification
 				}, {}, 'closed');
 			}

From b88d23e7e50d867afd9b5c27408c2e0a6b49fe31 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 18 Dec 2021 14:56:15 +0900
Subject: [PATCH 04/13] improve(client): show reload tip

---
 locales/ja-JP.yml                               | 1 +
 packages/client/src/pages/settings/reaction.vue | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 084fd6448..72c20819e 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -685,6 +685,7 @@ center: "中央"
 wide: "広い"
 narrow: "狭い"
 reloadToApplySetting: "設定はページリロード後に反映されます。今すぐリロードしますか？"
+needReloadToApply: "反映には再起動が必要です。"
 showTitlebar: "タイトルバーを表示する"
 clearCache: "キャッシュをクリア"
 onlineUsersCount: "{n}人がオンライン"
diff --git a/packages/client/src/pages/settings/reaction.vue b/packages/client/src/pages/settings/reaction.vue
index 1df61ac47..0d4db4693 100644
--- a/packages/client/src/pages/settings/reaction.vue
+++ b/packages/client/src/pages/settings/reaction.vue
@@ -30,7 +30,10 @@
 		<option :value="3">{{ $ts.large }}</option>
 	</FormRadios>
 
-	<FormSwitch v-model="reactionPickerUseDrawerForMobile" class="_formBlock">{{ $ts.useDrawerReactionPickerForMobile }}</FormSwitch>
+	<FormSwitch v-model="reactionPickerUseDrawerForMobile" class="_formBlock">
+		{{ $ts.useDrawerReactionPickerForMobile }}
+		<template #caption>{{ $ts.needReloadToApply }}</template>
+	</FormSwitch>
 
 	<FormSection>
 		<div style="display: flex; gap: var(--margin); flex-wrap: wrap;">

From 92c3e05133b239304358936345dd3524d9f215d2 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 18 Dec 2021 14:56:35 +0900
Subject: [PATCH 05/13] refactor(client): improve $i type

---
 packages/client/src/account.ts | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/packages/client/src/account.ts b/packages/client/src/account.ts
index ef7eb8f60..4c83b78c9 100644
--- a/packages/client/src/account.ts
+++ b/packages/client/src/account.ts
@@ -1,5 +1,6 @@
 import { del, get, set } from '@/scripts/idb-proxy';
 import { reactive } from 'vue';
+import * as misskey from 'misskey-js';
 import { apiUrl } from '@/config';
 import { waiting, api, popup, popupMenu, success } from '@/os';
 import { unisonReload, reloadChannel } from '@/scripts/unison-reload';
@@ -8,13 +9,7 @@ import { i18n } from './i18n';
 
 // TODO: 他のタブと永続化されたstateを同期
 
-type Account = {
-	id: string;
-	token: string;
-	isModerator: boolean;
-	isAdmin: boolean;
-	isDeleted: boolean;
-};
+type Account = misskey.entities.MeDetailed;
 
 const data = localStorage.getItem('account');
 

From eb6d2185b5a947d15e53e8070f48f5bc12d39998 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 18 Dec 2021 15:00:29 +0900
Subject: [PATCH 06/13] :art:

---
 packages/client/src/components/ui/menu.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/client/src/components/ui/menu.vue b/packages/client/src/components/ui/menu.vue
index fde199bc6..869709cf2 100644
--- a/packages/client/src/components/ui/menu.vue
+++ b/packages/client/src/components/ui/menu.vue
@@ -280,8 +280,7 @@ export default defineComponent({
 
 	> .divider {
 		margin: 8px 0;
-		height: 1px;
-		background: var(--divider);
+		border-top: solid 0.5px var(--divider);
 	}
 
 	&.asDrawer {

From 5d0d191a034b1efe0bbbd79efa0d304cf22614fc Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 18 Dec 2021 18:11:45 +0900
Subject: [PATCH 07/13] =?UTF-8?q?fix(client/deck):=20=E3=82=AB=E3=83=A9?=
 =?UTF-8?q?=E3=83=A0=E3=81=AE=E5=A2=97=E6=B8=9B=E3=81=8C=E3=83=9A=E3=83=BC?=
 =?UTF-8?q?=E3=82=B8=E3=82=92=E3=83=AA=E3=83=AD=E3=83=BC=E3=83=89=E3=81=99?=
 =?UTF-8?q?=E3=82=8B=E3=81=BE=E3=81=A7=E6=AD=A3=E3=81=97=E3=81=8F=E5=8F=8D?=
 =?UTF-8?q?=E6=98=A0=E3=81=95=E3=82=8C=E3=81=AA=E3=81=84=E5=95=8F=E9=A1=8C?=
 =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix #8065
---
 packages/client/src/ui/deck.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/ui/deck.vue b/packages/client/src/ui/deck.vue
index e1b2887bb..73dc83180 100644
--- a/packages/client/src/ui/deck.vue
+++ b/packages/client/src/ui/deck.vue
@@ -82,7 +82,7 @@ export default defineComponent({
 		});
 
 		const columns = deckStore.reactiveState.columns;
-		const layout = deckStore.reactiveState.layout.value;
+		const layout = deckStore.reactiveState.layout;
 		const menuIndicated = computed(() => {
 			if ($i == null) return false;
 			for (const def in menuDef) {

From 0bc4d0bc7819ada5455d109ed41a1a14249d0dc0 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 18 Dec 2021 18:13:50 +0900
Subject: [PATCH 08/13] Update CHANGELOG.md

---
 CHANGELOG.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d28937130..6df89aaf4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,14 @@
 
 -->
 
+## 12.x.x (unreleased)
+
+### Improvements
+
+### Bugfixes
+- クライアント: Deckカラムの増減がページをリロードするまで正しく反映されない問題を修正
+- クライアント: 一部のコンポーネントが裏に隠れるのを修正
+
 ## 12.100.1 (2021/12/17)
 
 ### Bugfixes

From 36dd2fa9efd95723f64e3e3fb49f74fe92075d10 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 18 Dec 2021 20:12:09 +0900
Subject: [PATCH 09/13] :art:

---
 packages/client/src/components/toast.vue | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/packages/client/src/components/toast.vue b/packages/client/src/components/toast.vue
index d9f0aa5ea..914704c52 100644
--- a/packages/client/src/components/toast.vue
+++ b/packages/client/src/components/toast.vue
@@ -42,7 +42,7 @@ export default defineComponent({
 }
 .toast-enter-from, .toast-leave-to {
 	opacity: 0;
-	transform: translateY(calc(0px - (100% - 32px)));
+	transform: translateY(-100%);
 }
 
 .mk-toast {
@@ -52,13 +52,12 @@ export default defineComponent({
 		right: 0;
 		top: 0;
 		margin: 0 auto;
-		padding-top: 32px;
-		margin-top: -32px;
+		margin-top: 16px;
 		min-width: 300px;
 		max-width: calc(100% - 32px);
 		width: min-content;
 		box-shadow: 0 4px 16px rgba(0, 0, 0, 0.3);
-		border-radius: 0 0 8px 8px;
+		border-radius: 8px;
 		overflow: clip;
 		text-align: center;
 		pointer-events: none;

From f6d32c3aad6aeebedbb966fb90ed8f86f203c0c8 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 18 Dec 2021 20:20:02 +0900
Subject: [PATCH 10/13] clean up

---
 packages/client/src/pages/emojis.emoji.vue | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/packages/client/src/pages/emojis.emoji.vue b/packages/client/src/pages/emojis.emoji.vue
index 4ca7c1574..814a047ad 100644
--- a/packages/client/src/pages/emojis.emoji.vue
+++ b/packages/client/src/pages/emojis.emoji.vue
@@ -12,7 +12,6 @@
 import { defineComponent } from 'vue';
 import * as os from '@/os';
 import copyToClipboard from '@/scripts/copy-to-clipboard';
-import VanillaTilt from 'vanilla-tilt';
 
 export default defineComponent({
 	props: {
@@ -22,17 +21,6 @@ export default defineComponent({
 		}
 	},
 
-	mounted() {
-		if (this.$store.animation) {
-			VanillaTilt.init(this.$el, {
-				reverse: true,
-				gyroscope: false,
-				scale: 1.1,
-				speed: 500,
-			});
-		}
-	},
-
 	methods: {
 		menu(ev) {
 			os.popupMenu([{

From d5b35e07b396e5606bcb95e77f3204b5a2807abb Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 18 Dec 2021 20:20:49 +0900
Subject: [PATCH 11/13] =?UTF-8?q?fix(client):=20=E3=82=AB=E3=82=B9?=
 =?UTF-8?q?=E3=82=BF=E3=83=A0=E7=B5=B5=E6=96=87=E5=AD=97=E4=B8=80=E8=A6=A7?=
 =?UTF-8?q?=E3=83=9A=E3=83=BC=E3=82=B8=E3=81=AE=E8=B2=A0=E8=8D=B7=E3=81=8C?=
 =?UTF-8?q?=E9=AB=98=E3=81=84=E3=81=AE=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                               | 1 +
 packages/client/src/pages/emojis.emoji.vue | 4 ----
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6df89aaf4..412035a86 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@
 ### Bugfixes
 - クライアント: Deckカラムの増減がページをリロードするまで正しく反映されない問題を修正
 - クライアント: 一部のコンポーネントが裏に隠れるのを修正
+- クライアント: カスタム絵文字一覧ページの負荷が高いのを修正
 
 ## 12.100.1 (2021/12/17)
 
diff --git a/packages/client/src/pages/emojis.emoji.vue b/packages/client/src/pages/emojis.emoji.vue
index 814a047ad..5dab72dae 100644
--- a/packages/client/src/pages/emojis.emoji.vue
+++ b/packages/client/src/pages/emojis.emoji.vue
@@ -47,8 +47,6 @@ export default defineComponent({
 	text-align: left;
 	background: var(--panel);
 	border-radius: 8px;
-	transform-style: preserve-3d;
-	transform: perspective(1000px);
 
 	&:hover {
 		border-color: var(--accent);
@@ -57,14 +55,12 @@ export default defineComponent({
 	> .img {
 		width: 42px;
 		height: 42px;
-		transform: translateZ(20px);
 	}
 
 	> .body {
 		padding: 0 0 0 8px;
 		white-space: nowrap;
 		overflow: hidden;
-		transform: translateZ(10px);
 
 		> .name {
 			text-overflow: ellipsis;

From ba4480e89aeeeb8a8cdce2f9da9b68078ae05971 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 18 Dec 2021 20:54:35 +0900
Subject: [PATCH 12/13] New Crowdin updates (#8058)

* New translations ja-JP.yml (Chinese Simplified)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (Esperanto)

* New translations ja-JP.yml (Esperanto)

* New translations ja-JP.yml (Esperanto)

* New translations ja-JP.yml (Esperanto)

* New translations ja-JP.yml (Esperanto)

* New translations ja-JP.yml (Esperanto)

* New translations ja-JP.yml (Esperanto)

* New translations ja-JP.yml (Esperanto)

* New translations ja-JP.yml (Esperanto)

* New translations ja-JP.yml (Esperanto)

* New translations ja-JP.yml (Esperanto)

* New translations ja-JP.yml (Esperanto)

* New translations ja-JP.yml (Esperanto)

* New translations ja-JP.yml (Esperanto)

* New translations ja-JP.yml (Esperanto)

* New translations ja-JP.yml (Esperanto)

* New translations ja-JP.yml (Esperanto)

* New translations ja-JP.yml (Esperanto)

* New translations ja-JP.yml (Esperanto)

* New translations ja-JP.yml (Esperanto)

* New translations ja-JP.yml (Esperanto)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (Chinese Simplified)

* New translations ja-JP.yml (Japanese, Kansai)

* New translations ja-JP.yml (Esperanto)

* New translations ja-JP.yml (Indonesian)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (Chinese Traditional)

* New translations ja-JP.yml (Ukrainian)

* New translations ja-JP.yml (Spanish)

* New translations ja-JP.yml (Russian)

* New translations ja-JP.yml (Polish)

* New translations ja-JP.yml (Dutch)

* New translations ja-JP.yml (Korean)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (Czech)

* New translations ja-JP.yml (Arabic)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (Chinese Simplified)

* New translations ja-JP.yml (Japanese, Kansai)

* New translations ja-JP.yml (Japanese, Kansai)

* New translations ja-JP.yml (Russian)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (English)
---
 locales/ar-SA.yml |  1 -
 locales/cs-CZ.yml |  1 -
 locales/de-DE.yml |  7 +++++-
 locales/en-US.yml |  7 +++++-
 locales/eo-UY.yml | 57 ++++++++++++++++++++++++++---------------------
 locales/es-ES.yml |  1 -
 locales/fr-FR.yml |  1 -
 locales/id-ID.yml |  1 -
 locales/it-IT.yml |  1 -
 locales/ja-KS.yml |  7 +++---
 locales/ko-KR.yml |  1 -
 locales/nl-NL.yml |  1 -
 locales/pl-PL.yml |  1 -
 locales/ru-RU.yml |  2 +-
 locales/uk-UA.yml |  1 -
 locales/zh-CN.yml |  5 ++++-
 locales/zh-TW.yml |  1 -
 17 files changed, 51 insertions(+), 45 deletions(-)

diff --git a/locales/ar-SA.yml b/locales/ar-SA.yml
index 23f7f48a1..95592d4f3 100644
--- a/locales/ar-SA.yml
+++ b/locales/ar-SA.yml
@@ -106,7 +106,6 @@ clickToShow: "اضغط للعرض"
 sensitive: "محتوى حساس"
 add: "إضافة"
 reaction: "التفاعلات"
-reactionSettingDescription: "اختر التفاعلات المفضلة التي تريد تثبيتها في منتقي التفاعلات."
 reactionSettingDescription2: "اسحب لترتيب ، انقر للحذف ، استخدم \"+\" للإضافة."
 rememberNoteVisibility: "تذكر إعدادت مدى رؤية الملاحظات"
 attachCancel: "أزل المرفق"
diff --git a/locales/cs-CZ.yml b/locales/cs-CZ.yml
index ae7a22b7f..90e8dbc9c 100644
--- a/locales/cs-CZ.yml
+++ b/locales/cs-CZ.yml
@@ -88,7 +88,6 @@ clickToShow: "Klikněte pro zobrazení"
 sensitive: "NSFW"
 add: "Přidat"
 reaction: "Reakce"
-reactionSettingDescription: "Vyberte Vaší oblíbenou reakci, kterou chcete připnout ve výběru."
 reactionSettingDescription2: "Přetažením změníte pořadí, kliknutím smažete, zmáčkněte \"+\" k přidání"
 rememberNoteVisibility: "Zapamatovat nastavení zobrazení poznámky"
 attachCancel: "Odstranit přílohu"
diff --git a/locales/de-DE.yml b/locales/de-DE.yml
index c615e6424..1e655f2a1 100644
--- a/locales/de-DE.yml
+++ b/locales/de-DE.yml
@@ -106,7 +106,7 @@ clickToShow: "Zum Anzeigen anklicken"
 sensitive: "NSFW"
 add: "Hinzufügen"
 reaction: "Reaktionen"
-reactionSettingDescription: "Wähle die Reaktionen aus, die in der Reaktionsauswahl angezeigt werden sollen."
+reactionSetting: "In der Reaktionsauswahl anzuzeigende Reaktionen"
 reactionSettingDescription2: "Ziehe zum Anordnen, klicke zum Löschen, drücke + zum Hinzufügen"
 rememberNoteVisibility: "Notizsichtbarkeit merken"
 attachCancel: "Anhang entfernen"
@@ -685,6 +685,7 @@ center: "Mitte"
 wide: "Breit"
 narrow: "Schmal"
 reloadToApplySetting: "Diese Einstellung tritt nach einer Aktualisierung der Seite in Kraft. Jetzt aktualisieren?"
+needReloadToApply: "Diese Einstellung tritt nach einer Aktualisierung der Seite in Kraft."
 showTitlebar: "Titelleiste anzeigen"
 clearCache: "Cache leeren"
 onlineUsersCount: "{n} Benutzer sind online"
@@ -813,6 +814,10 @@ deleteAccountConfirm: "Dein Benutzerkonto wird unwiderruflich gelöscht. Trotzde
 incorrectPassword: "Falsches Passwort."
 voteConfirm: "Wirklich für \"{choice}\" abstimmen?"
 hide: "Inhalt verbergen"
+leaveGroup: "Gruppe verlassen"
+leaveGroupConfirm: "Möchtest du \"{name}\" wirklich verlassen?"
+useDrawerReactionPickerForMobile: "Auf mobilen Geräten ausfahrbare Reaktionsauswahl anzeigen"
+welcomeBackWithName: "Willkommen zurück, {name}"
 _emailUnavailable:
   used: "Diese Email-Adresse wird bereits verwendet"
   format: "Das Format dieser Email-Adresse ist ungültig"
diff --git a/locales/en-US.yml b/locales/en-US.yml
index 65d1cc04a..8ae1671cf 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -106,7 +106,7 @@ clickToShow: "Click to show"
 sensitive: "NSFW"
 add: "Add"
 reaction: "Reactions"
-reactionSettingDescription: "Configure which reactions you want to display in the reaction picker."
+reactionSetting: "Reactions to show in the reaction picker"
 reactionSettingDescription2: "Drag to reorder, Click to delete, Press \"+\" to add"
 rememberNoteVisibility: "Remember note visibility settings"
 attachCancel: "Remove attachment"
@@ -685,6 +685,7 @@ center: "Center"
 wide: "Wide"
 narrow: "Narrow"
 reloadToApplySetting: "This setting will only apply after a page reload. Reload now?"
+needReloadToApply: "This setting will only apply after a page reload."
 showTitlebar: "Show title bar"
 clearCache: "Clear cache"
 onlineUsersCount: "{n} users are online"
@@ -812,6 +813,10 @@ deleteAccountConfirm: "This will irreversibly delete your account. Proceed?"
 incorrectPassword: "Incorrect password."
 voteConfirm: "Confirm your vote for \"{choice}\"?"
 hide: "Hide"
+leaveGroup: "Leave Group"
+leaveGroupConfirm: "Are you sure you want to leave \"{name}\"?"
+useDrawerReactionPickerForMobile: "Display reaction picker as drawer on mobile"
+welcomeBackWithName: "Welcome back, {name}"
 _emailUnavailable:
   used: "This email address is already being used"
   format: "The format of this email address is invalid"
diff --git a/locales/eo-UY.yml b/locales/eo-UY.yml
index 1128cb20b..38e07ba1f 100644
--- a/locales/eo-UY.yml
+++ b/locales/eo-UY.yml
@@ -2,7 +2,7 @@
 _lang_: "Esperanto"
 headlineMisskey: "Reto konektita per notoj"
 introMisskey: "Bonvenon! Misskey estas malfermitkoda malcentraliza etbloga servo.\nKreu \"noto\"n por diskonigi nunan aferon, aŭ por paroli vian penson al ĉiuj ĉirkaŭ vi. 📡\nLa funkcion \"reago\" ebligas esprimi rapide vian senton pri la noto de la alia en la Fediverso. 👍\nBonvole esploru novan mondon. 🚀"
-monthAndDay: "la {day}a de la {month}a monato"
+monthAndDay: "La {day}a de la {month}a monato"
 search: "Serĉi"
 notifications: "Sciigoj"
 username: "Uzantnomo"
@@ -67,13 +67,13 @@ driveFileDeleteConfirm: "Ĉu vi certas, ke vi volas forviŝi la dosieron \"{name
 unfollowConfirm: "Ĉu vi certas, ke vi volas ĉesi sekvi {name}?"
 lists: "Listoj"
 noLists: "Neniu listo"
-note: "Sendi"
+note: "Noti"
 notes: "Notoj"
 following: "Sekvatoj"
 followers: "Sekvantoj"
 followsYou: "Sekvas vin"
 createList: "Krei liston"
-manageLists: "Administri liston"
+manageLists: "Bonteni liston"
 error: "Eraro"
 somethingHappened: "Problemo okazis"
 retry: "Provi denove"
@@ -101,7 +101,6 @@ clickToShow: "Klaku por malkaŝu"
 sensitive: "Enhavo ne estas deca por laborejo (NSFW)"
 add: "Aldoni"
 reaction: "Reagoj"
-reactionSettingDescription: "Agordi la reagojn kiujn vi volas montrigi prefere ĉe la elektilo de reagoj"
 rememberNoteVisibility: "Rememori la agordon de videbleco de la laste sendita"
 attachCancel: "Deigi aldonaĵon"
 markAsSensitive: "Troviĝi NSFW"
@@ -129,8 +128,8 @@ emojiUrl: "URL de la emoĵio"
 addEmoji: "Aldoni emoĵion"
 settingGuide: "Agordaj rekomendoj"
 cacheRemoteFiles: "Stapli forajn dosierojn"
-flagAsBot: "Agordi por robota uzanto"
-flagAsCat: "Agordi por kata uzanto"
+flagAsBot: "Marki kiel uzata de roboto"
+flagAsCat: "Agordi kiel kat-iĝa"
 flagAsCatDescription: "Se vi estas kato, ebligu la agordon."
 autoAcceptFollowed: "Aŭtomate akcepti la peton de sekvado far uzantoj kiujn vi sekvas"
 addAccount: "Aldoni konton"
@@ -280,7 +279,7 @@ normal: "Normala"
 instanceName: "Nomo de la nodo"
 instanceDescription: "Priskribo de la nodo "
 maintainerName: "Nomo de la administranto"
-maintainerEmail: "Retpoŝtadreso de la administranto"
+maintainerEmail: "Retpoŝta adreso de la administranto"
 tosUrl: "URL de kondiĉoj de uzado"
 thisYear: "Ĉi-jare"
 thisMonth: "Ĉi-monate"
@@ -331,10 +330,10 @@ silenceConfirm: "Ĉu vi certas ke vi volas mutigi la uzanton?"
 unsilence: "Malmutigi"
 unsilenceConfirm: "Ĉu vi certas ke vi volas malmutigi la uzanton?"
 popularUsers: "Popularaj uzantoj"
-recentlyUpdatedUsers: "Uzantoj kiuj lastatempe sendis noton"
-recentlyRegisteredUsers: "Novaliĝintaj uzantoj"
-recentlyDiscoveredUsers: "Lastatempe trovitaj uzantoj"
-exploreUsersCount: "Tio estas {count} uzantoj"
+recentlyUpdatedUsers: "Lastatempe afiŝintaj uzantoj"
+recentlyRegisteredUsers: "Lastatempe aniĝintaj uzantoj"
+recentlyDiscoveredUsers: "Lastatempe eltrovitaj uzantoj"
+exploreUsersCount: "Jen {count} uzantoj"
 exploreFediverse: "Esplori la Fediverson"
 popularTags: "Popularaj kradvortoj"
 userList: "Listoj"
@@ -348,7 +347,7 @@ nUsersMentioned: "{n} uzanto(j) menciis"
 securityKey: "Sekureca ŝlosilo"
 securityKeyName: "Nomo de la ŝlosilo"
 registerSecurityKey: "Registri ŝlosilon de sekureco"
-lastUsed: "Plej malnove uzita"
+lastUsed: "La plej malnove uzita"
 unregister: "Malregistriĝi"
 passwordLessLogin: "Saluti sen pasvorto"
 resetPassword: "Restarigi pasvorton"
@@ -359,6 +358,7 @@ notFound: "Ne trovita"
 uploadFolder: "Dosierujo implicita por alŝuto"
 cacheClear: "Malplenigi staplon"
 markAsReadAllNotifications: "Marki ĉiujn sciigojn kiel legita"
+markAsReadAllTalkMessages: "Marki ĉiujn retbabiladojn kiel legita"
 help: "Manlibro de uzado"
 inputMessageHere: "Entajpu masaĝo tie ĉi"
 close: "Fermi"
@@ -381,7 +381,7 @@ retype: "Retajpu"
 noteOf: "Noto de {user}"
 inviteToGroup: "Inviti al grupo"
 quoteAttached: "Kun citaĵo"
-quoteQuestion: "Ĉu vi aldonas citaĵon?"
+quoteQuestion: "Ĉu vi volas aldoni citaĵon?"
 noMessagesYet: "Ankoraŭ neniu mesaĝo"
 newMessageExists: "Vi ricevis novan mesaĝon."
 onlyOneFileCanBeAttached: "Oni povas aldoni nur unu dosieron po mesaĝo."
@@ -481,7 +481,7 @@ description: "Priskribo"
 describeFile: "Priskribi la bildon"
 enterFileDescription: "Priskribu"
 author: "Aŭtoro"
-manage: "Administro"
+manage: "Bonteni"
 plugins: "Kromaĵoj"
 deck: "Kartaro"
 useFullReactionPicker: "Uzi la tuton de la elektilon de reagoj"
@@ -499,7 +499,7 @@ edit: "Redakti"
 emailServer: "Retpoŝta servilo"
 enableEmail: "Ebligi dissendon el retpoŝto"
 email: "Retpoŝto"
-emailAddress: "Retpoŝtadreso"
+emailAddress: "Retpoŝta adreso"
 smtpConfig: "Agordoj de SMTP servilo"
 smtpHost: "Transa servilo"
 smtpPort: "Pordo"
@@ -586,7 +586,7 @@ saveConfirm: "Ĉu vi konservas la ŝanĝon?"
 deleteConfirm: "Ĉu certas forviŝi?"
 closeAccount: "Forigi konton"
 currentVersion: "Nuna versio"
-latestVersion: "Plej nova versio"
+latestVersion: "La plej nova versio"
 youAreRunningUpToDateClient: "Vi uzas la plej novan version de via kliento."
 newVersionOfClientAvailable: "Nova versio de via kliento estas disponebla."
 inUse: "Uzata"
@@ -608,8 +608,9 @@ offline: "Forkonektita"
 instanceBlocking: "Bloki specifajn nodojn"
 selectAccount: "Elekti konton"
 user: "Uzantoj"
-administration: "Administro"
+administration: "Bontenado"
 accounts: "Kontoj"
+recentPosts: "Novaj afiŝoj"
 shareWithNote: "Kundividi en noto"
 ads: "Reklamaĵo"
 memo: "Memorigilo"
@@ -630,11 +631,14 @@ breakFollow: "Ĉesigi la sekvadon al vi"
 itsOn: "Ŝaltita"
 unread: "Nelegita"
 controlPanel: "Ŝaltpodio"
+manageAccounts: "Bonteni la kontojn"
 classic: "Klasika"
 ffVisibility: "Videbleco pri viaj sekvataro/sekvantaro\n"
 ffVisibilityDescription: "Agordi la videblecon kiu povas vidi tiujn kiujn vi sekvas kaj tiujn kiuj sekvas vin."
 continueThread: "Vidi pli mesaĝarojn"
 incorrectPassword: "Nevalida pasvorto"
+leaveGroup: "Eliĝi el la grupo"
+leaveGroupConfirm: "Ĉu vi certas ke vi volas eliĝi el la grupo {name}?"
 _emailUnavailable:
   used: "La retpoŝto jam estas uzita."
   format: "Nevalida formato."
@@ -662,7 +666,7 @@ _email:
     title: "Vi ricevis peton de sekvado"
 _plugin:
   install: "Instali kromaĵon"
-  manage: "Administri kromaĵojn"
+  manage: "Bonteni kromaĵojn"
 _registry:
   key: "Ŝlosilo"
   keys: "Ŝlosiloj"
@@ -709,9 +713,9 @@ _channel:
   edit: "Redakti kanalon"
   setBanner: "Apliki standardan bildon"
   removeBanner: "Forviŝi la standardan bildon"
-  owned: "Posedaĵo"
+  owned: "Bontenitaj de vi"
   following: "Sekvante"
-  usersCount: "{n} partoprenanto(j)"
+  usersCount: "{n} partoprenantoj"
 _menuDisplay:
   top: "Supro"
   hide: "Kaŝi"
@@ -721,7 +725,7 @@ _wordMute:
   hard: "Per la servilo"
   mutedNotes: "Silentigitaj notoj"
 _theme:
-  manage: "Administri kolorarojn"
+  manage: "Bonteni kolorarojn"
   code: "Kolorara kodo"
   description: "Priskribo"
   defaultValue: "Implicitaĵa valoro"
@@ -738,7 +742,7 @@ _theme:
     renote: "Plusendita"
     buttonBg: "Fono de butono"
     driveFolderBg: "Fono de dosierujo de la disko"
-    messageBg: "Fono de retbabilejo"
+    messageBg: "Fono de la retbabilejo"
 _sfx:
   note: "Nova noto"
   noteMy: "Mia noto"
@@ -780,8 +784,8 @@ _permissions:
   "write:favorites": "Redakti vian liston de preferaĵoj"
   "read:following": "Vidi la infomaciojn pri tio, kion vi sekvas"
   "write:following": "Sekvi aŭ malsekvi alian uzanton"
-  "read:messaging": "Vidi vian retbabiladon"
-  "write:messaging": "Retbabilejo"
+  "read:messaging": "Vidi viajn retbabiladojn"
+  "write:messaging": "Administri viajn retbabiladojn"
   "read:mutes": "Vidi vian liston de silentigitoj"
   "write:mutes": "Redakti vian liston de silentigitoj"
   "write:notes": "Krei / Forviŝi noton"
@@ -901,6 +905,7 @@ _pages:
   title: "Temlinio"
   url: "URL de paĝo"
   alignCenter: "Centrigi"
+  hideTitleWhenPinned: "Kaŝi la titolon de la paĝo kiam alpinglita"
   chooseBlock: "Aldoni blokon"
   contentBlocks: "Enhavo"
   inputBlocks: "Enigo"
@@ -1001,8 +1006,8 @@ _notification:
   youGotQuote: "{name} citis"
   youRenoted: "{name} plusendis"
   youGotPoll: "{name} balotis"
-  youGotMessagingMessageFromUser: "{name} sentis mesaĝon al vi."
-  youGotMessagingMessageFromGroup: "Retbabilan mesaĝon oni sendis al la grupo {name}"
+  youGotMessagingMessageFromUser: "{name} sendis al vi mesaĝon"
+  youGotMessagingMessageFromGroup: "Oni sendis al la grupo {name} mesaĝon"
   youWereFollowed: "eksekvis vin"
   youReceivedFollowRequest: "Vi ricevis peton de sekvado"
   yourFollowRequestAccepted: "Via peto de sekvado estis akceptita."
diff --git a/locales/es-ES.yml b/locales/es-ES.yml
index f22a104c7..84b24603f 100644
--- a/locales/es-ES.yml
+++ b/locales/es-ES.yml
@@ -104,7 +104,6 @@ clickToShow: "Click para ver"
 sensitive: "Marcado como sensible"
 add: "Agregar"
 reaction: "Reacción"
-reactionSettingDescription: "Asigne sus reacción favoritas que desean anclar en el selector de reacciones."
 reactionSettingDescription2: "Arrastre para reordenar, click para borrar, apriete la tecla + para añadir."
 rememberNoteVisibility: "Recordar visibilidad"
 attachCancel: "Quitar adjunto"
diff --git a/locales/fr-FR.yml b/locales/fr-FR.yml
index d1f023697..fd89ecb17 100644
--- a/locales/fr-FR.yml
+++ b/locales/fr-FR.yml
@@ -106,7 +106,6 @@ clickToShow: "Cliquer pour afficher"
 sensitive: "Contenu sensible"
 add: "Ajouter"
 reaction: "Réactions"
-reactionSettingDescription: "Choisissez vos réactions préférées que vous souhaitez épingler dans le sélecteur de réactions."
 reactionSettingDescription2: "Déplacer pour réorganiser, cliquer pour effacer, utiliser « + » pour ajouter."
 rememberNoteVisibility: "Activer l'option \" se souvenir de la visibilité des notes \" vous permet de réutiliser automatiquement la visibilité utilisée lors de la publication de votre note précédente."
 attachCancel: "Supprimer le fichier attaché"
diff --git a/locales/id-ID.yml b/locales/id-ID.yml
index ecf7dbffc..e083c27b2 100644
--- a/locales/id-ID.yml
+++ b/locales/id-ID.yml
@@ -106,7 +106,6 @@ clickToShow: "Klik untuk melihat"
 sensitive: "Konten sensitif"
 add: "Tambahkan"
 reaction: "Reaksi"
-reactionSettingDescription: "Masukkan reaksi favorit yang ingin kamu sematkan pada bilah reaksi"
 reactionSettingDescription2: "Geser untuk memindah urutkan, klik untuk menghapus, tekan \"+\" untuk menambahkan"
 rememberNoteVisibility: "Ingat pengaturan visibilitas catatan"
 attachCancel: "Hapus lampiran"
diff --git a/locales/it-IT.yml b/locales/it-IT.yml
index ed198c992..236568e2f 100644
--- a/locales/it-IT.yml
+++ b/locales/it-IT.yml
@@ -103,7 +103,6 @@ clickToShow: "Clicca per visualizzare"
 sensitive: "Contenuto sensibile"
 add: "Aggiungi"
 reaction: "Reazione"
-reactionSettingDescription: "Scegli le reazioni che preferisci e fissale nel pannello di reazioni."
 reactionSettingDescription2: "Trascina per riorganizzare, clicca per cancellare, usa il pulsante \"+\" per aggiungere."
 rememberNoteVisibility: "Ricordare le impostazioni di visibilità delle note"
 attachCancel: "Rimuovi allegato"
diff --git a/locales/ja-KS.yml b/locales/ja-KS.yml
index 96bc50a4b..25cc93b28 100644
--- a/locales/ja-KS.yml
+++ b/locales/ja-KS.yml
@@ -104,7 +104,6 @@ clickToShow: "押したら見えるで"
 sensitive: "ちょっとアカンやつやで"
 add: "増やす"
 reaction: "リアクション"
-reactionSettingDescription: "リアクションピッカーに出しとくリアクションを選んでや。"
 reactionSettingDescription2: "ドラッグで並び替え、クリックで削除、＋を押して追加やで。"
 rememberNoteVisibility: "公開範囲覚えといて"
 attachCancel: "のっけるのやめる"
@@ -204,7 +203,7 @@ noJobs: "ジョブはあらへん"
 federating: "連合しとる"
 blocked: "ブロックしとる"
 suspended: "配信せぇへん"
-all: "みな"
+all: "みんな"
 subscribing: "購読しとる"
 publishing: "配信しとる"
 notResponding: "応答してへんで"
@@ -849,7 +848,7 @@ _permissions:
 _auth:
   permissionAsk: "このアプリは次の権限を要求しとるで"
 _antennaSources:
-  all: "みなのノート"
+  all: "みんなのノート"
   homeTimeline: "フォローしとるユーザーのノート"
 _weekday:
   sunday: "日曜日"
@@ -897,7 +896,7 @@ _poll:
   votesCount: "{n}票"
   vote: "投票する"
 _visibility:
-  publicDescription: "みなのユーザーに公開"
+  publicDescription: "みんなに公開"
   home: "ホーム"
   followers: "フォロワー"
 _profile:
diff --git a/locales/ko-KR.yml b/locales/ko-KR.yml
index 080d59fc3..8b7513ffa 100644
--- a/locales/ko-KR.yml
+++ b/locales/ko-KR.yml
@@ -106,7 +106,6 @@ clickToShow: "클릭하여 보기"
 sensitive: "열람주의"
 add: "추가"
 reaction: "리액션"
-reactionSettingDescription: "리액션 선택 상자에 표시할 리액션을 설정합니다."
 reactionSettingDescription2: "끌어서 순서 변경, 클릭해서 삭제, ＋를 눌러서 추가할 수 있습니다."
 rememberNoteVisibility: "공개 범위를 기억하기"
 attachCancel: "첨부 취소"
diff --git a/locales/nl-NL.yml b/locales/nl-NL.yml
index 364e877c5..09e0fb627 100644
--- a/locales/nl-NL.yml
+++ b/locales/nl-NL.yml
@@ -106,7 +106,6 @@ clickToShow: "Klik om te bekijken"
 sensitive: "NSFW"
 add: "Toevoegen"
 reaction: "Reacties"
-reactionSettingDescription: "Configureer welke reacties je wilt weergeven in de reactiekiezer."
 reactionSettingDescription2: "Sleep om opnieuw te ordenen, Klik om te verwijderen, Druk op \"+\" om toe te voegen"
 rememberNoteVisibility: "Vergeet niet de notitie zichtbaarheidsinstellingen"
 attachCancel: "Verwijder bijlage"
diff --git a/locales/pl-PL.yml b/locales/pl-PL.yml
index 0d744167d..ca2af6647 100644
--- a/locales/pl-PL.yml
+++ b/locales/pl-PL.yml
@@ -104,7 +104,6 @@ clickToShow: "Kliknij, aby wyświetlić"
 sensitive: "NSFW"
 add: "Dodaj"
 reaction: "Reakcja"
-reactionSettingDescription: "Przypisz swoje ulubione reakcje, które chcesz przypiąć w wyborze reakcji."
 reactionSettingDescription2: "Przeciągnij aby zmienić kolejność, naciśnij aby usunąć, naciśnij „+” aby dodać"
 rememberNoteVisibility: "Zapamiętuj ustawienia widoczności wpisu"
 attachCancel: "Usuń załącznik"
diff --git a/locales/ru-RU.yml b/locales/ru-RU.yml
index e0a049b7f..19fe6a689 100644
--- a/locales/ru-RU.yml
+++ b/locales/ru-RU.yml
@@ -106,7 +106,6 @@ clickToShow: "Нажмите для просмотра"
 sensitive: "Содержимое не для всех"
 add: "Добавить"
 reaction: "Реакции"
-reactionSettingDescription: "Подберите, что будет у вас в палитре реакций"
 reactionSettingDescription2: "Расставляйте перетаскиванием, удаляйте нажатием, добавляйте кнопкой «+»."
 rememberNoteVisibility: "Запоминать видимость заметок"
 attachCancel: "Удалить вложение"
@@ -803,6 +802,7 @@ classic: "Классика"
 unmuteThread: "Отключить звук"
 ffVisibilityDescription: "Вы можете установить объем вашей следующей/последней информации."
 hide: "Спрятать"
+leaveGroupConfirm: "Вы хотите оставить \"{name}\"?"
 _emailUnavailable:
   used: "Уже используется"
   format: "Неправильный формат"
diff --git a/locales/uk-UA.yml b/locales/uk-UA.yml
index 375f05f73..029f5ef3c 100644
--- a/locales/uk-UA.yml
+++ b/locales/uk-UA.yml
@@ -103,7 +103,6 @@ clickToShow: "Натисніть для перегляду"
 sensitive: "NSFW"
 add: "Додати"
 reaction: "Реакції"
-reactionSettingDescription: "Виберіть свої улюблені реакції, які хочете закріпити в селекторі реакцій."
 reactionSettingDescription2: "Перемістити щоб змінити порядок, Клацнути мишою щоб видалити, Натиснути \"+\" щоб додати."
 rememberNoteVisibility: "Пам’ятати параметри видимісті"
 attachCancel: "Видалити вкладення"
diff --git a/locales/zh-CN.yml b/locales/zh-CN.yml
index 410d32219..dd69a3c7c 100644
--- a/locales/zh-CN.yml
+++ b/locales/zh-CN.yml
@@ -106,7 +106,7 @@ clickToShow: "点击以显示"
 sensitive: "敏感内容"
 add: "添加"
 reaction: "回应"
-reactionSettingDescription: "选择您想要置顶的回应。"
+reactionSetting: "在选择器中显示的回应"
 reactionSettingDescription2: "拖动重新排序，单击删除，点击 + 添加。"
 rememberNoteVisibility: "保存上次设置的可见性"
 attachCancel: "删除附件"
@@ -813,6 +813,9 @@ deleteAccountConfirm: "将要删除账户。是否确认？"
 incorrectPassword: "密码错误"
 voteConfirm: "确定投给“{choice}” ？"
 hide: "隐藏"
+leaveGroup: "离开群组"
+leaveGroupConfirm: "确定离开「{name}」？"
+useDrawerReactionPickerForMobile: "在移动设备上使用抽屉显示"
 _emailUnavailable:
   used: "已经被使用过"
   format: "无效的格式"
diff --git a/locales/zh-TW.yml b/locales/zh-TW.yml
index bba04170e..364ef3dd9 100644
--- a/locales/zh-TW.yml
+++ b/locales/zh-TW.yml
@@ -104,7 +104,6 @@ clickToShow: "按一下以顯示"
 sensitive: "敏感內容"
 add: "新增"
 reaction: "情感"
-reactionSettingDescription: "置頂「反應」表情符號\n"
 reactionSettingDescription2: "拖動以重新列序，點擊以刪除，按下 + 添加。"
 rememberNoteVisibility: "記住貼文可見性"
 attachCancel: "移除附件"

From c8ca9ced6361613792bd757c49879f4f37194853 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 18 Dec 2021 20:59:05 +0900
Subject: [PATCH 13/13] 12.100.2

---
 CHANGELOG.md | 4 +---
 package.json | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 412035a86..e15c6d646 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,9 +7,7 @@
 
 -->
 
-## 12.x.x (unreleased)
-
-### Improvements
+## 12.100.2 (2021/12/18)
 
 ### Bugfixes
 - クライアント: Deckカラムの増減がページをリロードするまで正しく反映されない問題を修正
diff --git a/package.json b/package.json
index 3e7e4b9d6..58df68ca2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "12.100.1",
+	"version": "12.100.2",
 	"codename": "indigo",
 	"repository": {
 		"type": "git",