From 80619260c11a44ad50619aaed2578eb5dc0260e9 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Tue, 9 May 2023 13:57:43 +0900
Subject: [PATCH 1/8] =?UTF-8?q?fix(frontend):=20=E3=83=A6=E3=83=BC?=
 =?UTF-8?q?=E3=82=B6=E3=83=BC=E9=81=B8=E6=8A=9E=E3=83=80=E3=82=A4=E3=82=A2?=
 =?UTF-8?q?=E3=83=AD=E3=82=B0=E3=81=8C=E8=A1=A8=E7=A4=BA=E3=81=95=E3=82=8C?=
 =?UTF-8?q?=E3=81=AA=E3=81=84=E5=95=8F=E9=A1=8C=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 #10809
---
 CHANGELOG.md                                       | 12 ++++++++++++
 packages/frontend/src/components/MkModalWindow.vue |  7 +++----
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 003e907c5f..83caa66a46 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,18 @@
 -
 
 -->
+
+## 13.x.x (unreleased)
+
+### General
+-
+
+### Client
+- Fix: ユーザー選択ダイアログが表示されない問題を修正
+
+### Server
+-
+
 ## 13.12.0
 
 ### NOTE
diff --git a/packages/frontend/src/components/MkModalWindow.vue b/packages/frontend/src/components/MkModalWindow.vue
index 1c942cfd0d..ad7dc4da11 100644
--- a/packages/frontend/src/components/MkModalWindow.vue
+++ b/packages/frontend/src/components/MkModalWindow.vue
@@ -1,6 +1,6 @@
 <template>
 <MkModal ref="modal" :prefer-type="'dialog'" @click="onBgClick" @closed="$emit('closed')">
-	<div ref="rootEl" class="ebkgoccj" :style="{ width: `${width}px`, height: height ? `${height}px` : null }" @keydown="onKeydown">
+	<div ref="rootEl" class="ebkgoccj" :style="{ width: `${width}px`, height: `min(${height}px, 100%)` }" @keydown="onKeydown">
 		<div ref="headerEl" class="header">
 			<button v-if="withOkButton" class="_button" @click="$emit('close')"><i class="ti ti-x"></i></button>
 			<span class="title">
@@ -24,12 +24,12 @@ const props = withDefaults(defineProps<{
 	withOkButton: boolean;
 	okButtonDisabled: boolean;
 	width: number;
-	height: number | null;
+	height: number;
 }>(), {
 	withOkButton: false,
 	okButtonDisabled: false,
 	width: 400,
-	height: null,
+	height: 500,
 });
 
 const emit = defineEmits<{
@@ -84,7 +84,6 @@ defineExpose({
 <style lang="scss" scoped>
 .ebkgoccj {
 	margin: auto;
-	max-height: 100%;
 	overflow: hidden;
 	display: flex;
 	flex-direction: column;

From 1c0ec222b414a25c997fb800d450b39be8586d05 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Tue, 9 May 2023 14:28:27 +0900
Subject: [PATCH 2/8] =?UTF-8?q?enhance(frontend):=20=E3=83=97=E3=83=AD?=
 =?UTF-8?q?=E3=83=95=E3=82=A3=E3=83=BC=E3=83=AB=E7=94=BB=E9=9D=A2=E3=81=AB?=
 =?UTF-8?q?=E3=81=8A=E3=81=91=E3=82=8B=E3=83=A2=E3=83=87=E3=83=AC=E3=83=BC?=
 =?UTF-8?q?=E3=82=B7=E3=83=A7=E3=83=B3=E3=83=8E=E3=83=BC=E3=83=88=E3=81=AE?=
 =?UTF-8?q?=E8=A1=A8=E7=A4=BA=E3=82=92=E8=AA=BF=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Resolve #10807
---
 CHANGELOG.md                              | 1 +
 packages/frontend/src/pages/user/home.vue | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 83caa66a46..05f1d279af 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@
 -
 
 ### Client
+- プロフィール画面におけるモデレーションノートの表示を調整
 - Fix: ユーザー選択ダイアログが表示されない問題を修正
 
 ### Server
diff --git a/packages/frontend/src/pages/user/home.vue b/packages/frontend/src/pages/user/home.vue
index 5bc1578268..9c133346d5 100644
--- a/packages/frontend/src/pages/user/home.vue
+++ b/packages/frontend/src/pages/user/home.vue
@@ -49,9 +49,12 @@
 						</span>
 					</div>
 					<div v-if="iAmModerator" class="moderationNote">
-						<MkTextarea v-model="moderationNote" manual-save>
+						<MkTextarea v-if="editModerationNote || (moderationNote != null && moderationNote !== '')" v-model="moderationNote" manual-save>
 							<template #label>Moderation note</template>
 						</MkTextarea>
+						<div v-else>
+							<MkButton small @click="editModerationNote = true">Add moderation note</MkButton>
+						</div>
 					</div>
 					<div v-if="isEditingMemo || memoDraft" class="memo" :class="{'no-memo': !memoDraft}">
 						<div class="heading" v-text="i18n.ts.memo"/>
@@ -142,6 +145,7 @@ import MkRemoteCaution from '@/components/MkRemoteCaution.vue';
 import MkTextarea from '@/components/MkTextarea.vue';
 import MkOmit from '@/components/MkOmit.vue';
 import MkInfo from '@/components/MkInfo.vue';
+import MkButton from '@/components/MkButton.vue';
 import { getScrollPosition } from '@/scripts/scroll';
 import { getUserMenu } from '@/scripts/get-user-menu';
 import number from '@/filters/number';
@@ -176,6 +180,7 @@ let memoTextareaEl = $ref<null | HTMLElement>(null);
 let memoDraft = $ref(props.user.memo);
 let isEditingMemo = $ref(false);
 let moderationNote = $ref(props.user.moderationNote);
+let editModerationNote = $ref(false);
 
 watch($$(moderationNote), async () => {
 	await os.api('admin/update-user-note', { userId: props.user.id, text: moderationNote });

From b2f6c67aa987d755fbb939d1ce6ddf07af16cc79 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Tue, 9 May 2023 14:57:42 +0900
Subject: [PATCH 3/8] =?UTF-8?q?fix(backend):=20=E3=83=AA=E3=83=A2=E3=83=BC?=
 =?UTF-8?q?=E3=83=88=E3=82=B5=E3=83=BC=E3=83=90=E3=83=BC=E3=81=AE=E6=83=85?=
 =?UTF-8?q?=E5=A0=B1=E3=81=8C=E6=9B=B4=E6=96=B0=E3=81=A7=E3=81=8D=E3=81=AA?=
 =?UTF-8?q?=E3=81=84=E5=95=8F=E9=A1=8C=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 #10787
---
 CHANGELOG.md                                          | 2 +-
 packages/backend/src/core/FederatedInstanceService.ts | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 05f1d279af..a6239e4f2b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,7 +22,7 @@
 - Fix: ユーザー選択ダイアログが表示されない問題を修正
 
 ### Server
--
+- Fix: リモートサーバーの情報が更新できない問題を修正
 
 ## 13.12.0
 
diff --git a/packages/backend/src/core/FederatedInstanceService.ts b/packages/backend/src/core/FederatedInstanceService.ts
index 2049bd4c60..8b9a87a380 100644
--- a/packages/backend/src/core/FederatedInstanceService.ts
+++ b/packages/backend/src/core/FederatedInstanceService.ts
@@ -74,9 +74,7 @@ export class FederatedInstanceService {
 			.then((response) => {
 				return response.raw[0];
 			});
-
-		const updated = result.raw[0];
 	
-		this.federatedInstanceCache.set(updated.host, updated);
+		this.federatedInstanceCache.set(result.host, result);
 	}
 }

From 64f5b2daa29fe2410c9dd1bac7966ffd68886561 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Tue, 9 May 2023 14:58:49 +0900
Subject: [PATCH 4/8] New Crowdin updates (#10808)

* New translations ja-JP.yml (Korean)

* New translations ja-JP.yml (Korean)
---
 locales/ko-KR.yml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/locales/ko-KR.yml b/locales/ko-KR.yml
index 4a2fbe2a80..ef690d260b 100644
--- a/locales/ko-KR.yml
+++ b/locales/ko-KR.yml
@@ -1040,6 +1040,7 @@ initialAccountSetting: "초기 설정"
 youFollowing: "팔로잉"
 _initialAccountSetting:
   accountCreated: "계정 생성이 완료되었습니다!"
+  letsStartAccountSetup: "계정의 초기 설정을 진행합니다."
   letsFillYourProfile: "우선 나의 프로필을 설정해 보아요."
   profileSetting: "프로필 설정"
   theseSettingsCanEditLater: "이 설정들은 나중에도 변경할 수 있습니다."
@@ -1049,6 +1050,7 @@ _initialAccountSetting:
   initialAccountSettingCompleted: "초기 설정을 모두 마쳤습니다!"
   haveFun: "{name}와 함께 즐거운 시간 보내세요!"
   ifYouNeedLearnMore: "{name}(Misskey)의 사용 방법에 대해 자세히 알아보려면 {link}를 참고해 주세요."
+  skipAreYouSure: "초기 설정을 넘기시겠습니까?"
 _serverRules:
   description: "회원 가입 이전에 간단하게 표시할 서버 규칙입니다. 이용 약관의 요약으로 구성하는 것을 추천합니다."
 _accountMigration:
@@ -1597,6 +1599,16 @@ _time:
   minute: "분"
   hour: "시간"
   day: "일"
+_timelineTutorial:
+  title: "Misskey의 사용 방법"
+  step1_1: "이것은 '타임라인'입니다. {name}에 게시된 '노트'가 시간 순서대로 표시됩니다."
+  step1_2: "타임라인은 몇 가지 종류로 나뉩니다. 그 중에 '홈 타임라인'은 내가 팔로우한 사람의 노트가 표시되며, '로컬 타임라인'에는 {name} 의 모든 노트가 표시됩니다."
+  step2_1: "그럼 시험삼아 노트를 작성해 봅시다. 화면에 있는 연필 버튼을 눌러 보세요."
+  step2_2: "첫 노트이니까 자기소개, 혹은 가볍게 \"안녕 {name}\"라고 올려 보는 건 어떨까요?"
+  step3_1: "노트 작성을 끝내셨나요?"
+  step3_2: "당신의 노트가 타임라인에 표시되어 있다면 성공입니다."
+  step4_1: "노트에는 '리액션'을 붙일 수 있습니다."
+  step4_2: "리액션을 붙이려면, 노트의 \"+\" 버튼을 클릭하고 원하는 이모지를 선택합니다."
 _2fa:
   alreadyRegistered: "이미 설정이 완료되었습니다."
   registerTOTP: "인증 앱 설정 시작"

From 9e70b02648c3c847d39a6aeb56e715b447ae2285 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Tue, 9 May 2023 14:59:22 +0900
Subject: [PATCH 5/8] 13.12.1

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a6239e4f2b..cd26ddc84f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,10 +12,7 @@
 
 -->
 
-## 13.x.x (unreleased)
-
-### General
--
+## 13.12.1
 
 ### Client
 - プロフィール画面におけるモデレーションノートの表示を調整
diff --git a/package.json b/package.json
index 5b1d21b815..28e1cdcf1e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "13.12.0",
+	"version": "13.12.1",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",

From 22d6c7fe8af3b0fa7854f41e1a1221cdad5ecaa9 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Tue, 9 May 2023 15:28:44 +0900
Subject: [PATCH 6/8] =?UTF-8?q?fix(backend):=2013.11=E3=82=92=E7=B5=8C?=
 =?UTF-8?q?=E9=A8=93=E3=81=97=E3=81=AA=E3=81=84=E7=8A=B6=E6=85=8B=E3=81=A7?=
 =?UTF-8?q?13.12=E3=81=AB=E3=82=A2=E3=83=83=E3=83=97=E3=83=87=E3=83=BC?=
 =?UTF-8?q?=E3=83=88=E3=81=97=E3=81=9F=E5=A0=B4=E5=90=88=E3=83=A6=E3=83=BC?=
 =?UTF-8?q?=E3=82=B6=E3=83=BC=E3=83=97=E3=83=AD=E3=83=95=E3=82=A3=E3=83=BC?=
 =?UTF-8?q?=E3=83=AB=E9=96=A2=E9=80=A3=E3=81=AE=E7=94=BB=E5=83=8F=E3=81=8C?=
 =?UTF-8?q?=E6=B6=88=E5=A4=B1=E3=81=99=E3=82=8B=E5=95=8F=E9=A1=8C=E3=82=92?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix #10811
---
 CHANGELOG.md                                   |  1 +
 .../src/core/entities/UserEntityService.ts     | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cd26ddc84f..47a9d48acc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,7 @@
 
 ### Server
 - Fix: リモートサーバーの情報が更新できない問題を修正
+- Fix: 13.11を経験しない状態で13.12にアップデートした場合ユーザープロフィール関連の画像が消失する問題を修正
 
 ## 13.12.0
 
diff --git a/packages/backend/src/core/entities/UserEntityService.ts b/packages/backend/src/core/entities/UserEntityService.ts
index a7f62c05f7..453c1473dd 100644
--- a/packages/backend/src/core/entities/UserEntityService.ts
+++ b/packages/backend/src/core/entities/UserEntityService.ts
@@ -306,6 +306,24 @@ export class UserEntityService implements OnModuleInit {
 
 		const user = typeof src === 'object' ? src : await this.usersRepository.findOneByOrFail({ id: src });
 
+		// migration
+		if (user.avatarId != null && user.avatarUrl === null) {
+			const avatar = await this.driveFilesRepository.findOneByOrFail({ id: user.avatarId });
+			user.avatarUrl = this.driveFileEntityService.getPublicUrl(avatar, 'avatar');
+			this.usersRepository.update(user.id, {
+				avatarUrl: user.avatarUrl,
+				avatarBlurhash: avatar.blurhash,
+			});
+		}
+		if (user.bannerId != null && user.bannerUrl === null) {
+			const banner = await this.driveFilesRepository.findOneByOrFail({ id: user.bannerId });
+			user.bannerUrl = this.driveFileEntityService.getPublicUrl(banner);
+			this.usersRepository.update(user.id, {
+				bannerUrl: user.bannerUrl,
+				bannerBlurhash: banner.blurhash,
+			});
+		}
+
 		const meId = me ? me.id : null;
 		const isMe = meId === user.id;
 		const iAmModerator = me ? await this.roleService.isModerator(me as User) : false;

From 6894e4267436bbc78f8a7e8c56ecdce2db4339be Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Tue, 9 May 2023 06:33:50 +0000
Subject: [PATCH 7/8] =?UTF-8?q?fix(client):=20MkUserInfo=E3=81=AE=E3=83=95?=
 =?UTF-8?q?=E3=82=A9=E3=83=AD=E3=83=BC=E3=83=9C=E3=82=BF=E3=83=B3=E3=81=8C?=
 =?UTF-8?q?=E5=A4=89=E3=81=AA=E4=BD=8D=E7=BD=AE=E3=81=AB=E3=81=82=E3=82=8B?=
 =?UTF-8?q?=E5=95=8F=E9=A1=8C=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/frontend/src/components/MkUserInfo.vue | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 47a9d48acc..d6efb60502 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@
 ### Client
 - プロフィール画面におけるモデレーションノートの表示を調整
 - Fix: ユーザー選択ダイアログが表示されない問題を修正
+- Fix: MkUserInfoのフォローボタンが変な位置にある問題を修正
 
 ### Server
 - Fix: リモートサーバーの情報が更新できない問題を修正
diff --git a/packages/frontend/src/components/MkUserInfo.vue b/packages/frontend/src/components/MkUserInfo.vue
index 6349ada65a..f560ebcd8a 100644
--- a/packages/frontend/src/components/MkUserInfo.vue
+++ b/packages/frontend/src/components/MkUserInfo.vue
@@ -131,7 +131,7 @@ defineProps<{
 }
 
 .follow {
-	position: absolute;
+	position: absolute !important;
 	top: 8px;
 	right: 8px;
 }

From 461f761aa6ead8cc92c8b126142dca3255ae1c6c Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Tue, 9 May 2023 15:37:13 +0900
Subject: [PATCH 8/8] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d6efb60502..50e097c683 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,7 +16,7 @@
 
 ### Client
 - プロフィール画面におけるモデレーションノートの表示を調整
-- Fix: ユーザー選択ダイアログが表示されない問題を修正
+- Fix: 一部ダイアログが表示されない問題を修正
 - Fix: MkUserInfoのフォローボタンが変な位置にある問題を修正
 
 ### Server