From 62d26a5d0a8bdd6149232afd9c69fd998dad1cfa Mon Sep 17 00:00:00 2001
From: CyberRex <hspwinx86@gmail.com>
Date: Mon, 16 Oct 2023 17:29:46 +0900
Subject: [PATCH 1/4] =?UTF-8?q?=E6=8A=95=E7=A8=BF=E3=83=95=E3=82=A9?=
 =?UTF-8?q?=E3=83=BC=E3=83=A0=E3=81=ABNSFW=E3=82=AC=E3=82=A4=E3=83=89?=
 =?UTF-8?q?=E3=83=A9=E3=82=A4=E3=83=B3=E3=81=B8=E3=81=AE=E5=B0=8E=E7=B7=9A?=
 =?UTF-8?q?=E3=82=92=E8=BF=BD=E5=8A=A0=20(MisskeyIO#182)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 locales/index.d.ts                              |  1 +
 locales/ja-JP.yml                               |  1 +
 packages/frontend/src/components/MkInfo.vue     | 14 ++++++++++----
 packages/frontend/src/components/MkPostForm.vue |  7 +++++++
 4 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/locales/index.d.ts b/locales/index.d.ts
index 3fc1473be..85d959697 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -1981,6 +1981,7 @@ export interface Locale {
             "e": string;
             "f": string;
         };
+        "guidelineInfo": string;
     };
     "_profile": {
         "name": string;
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 96b56e28e..5a194d5c8 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -1897,6 +1897,7 @@ _postForm:
     d: "言いたいことは？"
     e: "ここに書いてください"
     f: "あなたが書くのを待っています..."
+  guidelineInfo: "[NSFWガイドライン]({nsfwGuideUrl})を必ずお読みになってからご利用ください。"
 
 _profile:
   name: "名前"
diff --git a/packages/frontend/src/components/MkInfo.vue b/packages/frontend/src/components/MkInfo.vue
index 37490887e..302b86e8f 100644
--- a/packages/frontend/src/components/MkInfo.vue
+++ b/packages/frontend/src/components/MkInfo.vue
@@ -4,7 +4,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<div :class="[$style.root, { [$style.warn]: warn }]">
+<div :class="[$style.root, { [$style.warn]: warn, [$style.rounded]: rounded }]">
 	<i v-if="warn" class="ti ti-alert-triangle" :class="$style.i"></i>
 	<i v-else class="ti ti-info-circle" :class="$style.i"></i>
 	<slot></slot>
@@ -14,9 +14,12 @@ SPDX-License-Identifier: AGPL-3.0-only
 <script lang="ts" setup>
 import { } from 'vue';
 
-const props = defineProps<{
+const props = withDefaults(defineProps<{
 	warn?: boolean;
-}>();
+	rounded?: boolean;
+}>(), {
+	rounded: true,
+});
 </script>
 
 <style lang="scss" module>
@@ -25,13 +28,16 @@ const props = defineProps<{
 	font-size: 90%;
 	background: var(--infoBg);
 	color: var(--infoFg);
-	border-radius: var(--radius);
 	white-space: pre-wrap;
 
 	&.warn {
 		background: var(--infoWarnBg);
 		color: var(--infoWarnFg);
 	}
+
+	&.rounded {
+		border-radius: var(--radius);
+	}
 }
 
 .i {
diff --git a/packages/frontend/src/components/MkPostForm.vue b/packages/frontend/src/components/MkPostForm.vue
index 0aa7974ce..ddc321f6e 100644
--- a/packages/frontend/src/components/MkPostForm.vue
+++ b/packages/frontend/src/components/MkPostForm.vue
@@ -71,6 +71,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 		<div v-if="maxTextLength - textLength < 100" :class="['_acrylic', $style.textCount, { [$style.textOver]: textLength > maxTextLength }]">{{ maxTextLength - textLength }}</div>
 	</div>
 	<input v-show="withHashtags" ref="hashtagsInputEl" v-model="hashtags" :class="$style.hashtags" :placeholder="i18n.ts.hashtags" list="hashtags">
+	<MkInfo v-if="files.length > 0" warn :class="$style.guidelineInfo" :rounded="false"><Mfm :text="i18n.t('_postForm.guidelineInfo', { tosUrl: instance.tosUrl, nsfwGuideUrl })"/></MkInfo>
 	<XPostFormAttaches v-model="files" @detach="detachFile" @changeSensitive="updateFileSensitive" @changeName="updateFileName" @replaceFile="replaceFile"/>
 	<MkPollEditor v-if="poll" v-model="poll" @destroyed="poll = null"/>
 	<MkNotePreview v-if="showPreview" :class="$style.preview" :text="text"/>
@@ -189,6 +190,8 @@ let recentHashtags = $ref(JSON.parse(miLocalStorage.getItem('hashtags') ?? '[]')
 let imeText = $ref('');
 let showingOptions = $ref(false);
 
+const nsfwGuideUrl = 'https://go.misskey.io/media-guideline';
+
 const draftKey = $computed((): string => {
 	let key = props.channel ? `channel:${props.channel.id}` : '';
 
@@ -1178,6 +1181,10 @@ defineExpose({
 	color: var(--accent);
 }
 
+.guidelineInfo {
+	margin-top: 8px;
+}
+
 @container (max-width: 500px) {
 	.headerRight {
 		font-size: .9em;

From f3043278ea99b597d9d9b5bf884f7b2e7faff7e7 Mon Sep 17 00:00:00 2001
From: nenohi <kimutipartylove@gmail.com>
Date: Tue, 17 Oct 2023 14:02:20 +0900
Subject: [PATCH 2/4] =?UTF-8?q?=E7=B5=B5=E6=96=87=E5=AD=97=E3=81=AESet=20L?=
 =?UTF-8?q?isence=E3=82=92=E8=A4=87=E6=95=B0=E8=A1=8C=E5=AF=BE=E5=BF=9C=20?=
 =?UTF-8?q?(MisskeyIO#181)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/frontend/src/components/MkDialog.vue | 26 +++++++++++++------
 packages/frontend/src/os.ts                   |  2 +-
 .../src/pages/custom-emojis-manager.vue       |  1 +
 3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/packages/frontend/src/components/MkDialog.vue b/packages/frontend/src/components/MkDialog.vue
index 0c993bd88..260125e0d 100644
--- a/packages/frontend/src/components/MkDialog.vue
+++ b/packages/frontend/src/components/MkDialog.vue
@@ -27,13 +27,22 @@ SPDX-License-Identifier: AGPL-3.0-only
 		</div>
 		<header v-if="title" :class="$style.title"><Mfm :text="title"/></header>
 		<div v-if="text" :class="$style.text"><Mfm :text="text"/></div>
-		<MkInput v-if="input" v-model="inputValue" autofocus :type="input.type || 'text'" :placeholder="input.placeholder || undefined" :autocomplete="input.autocomplete" @keydown="onInputKeydown">
-			<template v-if="input.type === 'password'" #prefix><i class="ti ti-lock"></i></template>
-			<template #caption>
-				<span v-if="okButtonDisabled && disabledReason === 'charactersExceeded'" v-text="i18n.t('_dialog.charactersExceeded', { current: (inputValue as string).length, max: input.maxLength ?? 'NaN' })"/>
-				<span v-else-if="okButtonDisabled && disabledReason === 'charactersBelow'" v-text="i18n.t('_dialog.charactersBelow', { current: (inputValue as string).length, min: input.minLength ?? 'NaN' })"/>
-			</template>
-		</MkInput>
+		<template v-if="input">
+			<MkInput v-if="input.type != 'textarea'" v-model="inputValue" autofocus :type="input.type || 'text'" :placeholder="input.placeholder || undefined" :autocomplete="input.autocomplete" @keydown="onInputKeydown">
+				<template v-if="input.type === 'password'" #prefix><i class="ti ti-lock"></i></template>
+				<template #caption>
+					<span v-if="okButtonDisabled && disabledReason === 'charactersExceeded'" v-text="i18n.t('_dialog.charactersExceeded', { current: (inputValue as string).length, max: input.maxLength ?? 'NaN' })"/>
+					<span v-else-if="okButtonDisabled && disabledReason === 'charactersBelow'" v-text="i18n.t('_dialog.charactersBelow', { current: (inputValue as string).length, min: input.minLength ?? 'NaN' })"/>
+				</template>
+			</MkInput>
+			<MkTextarea v-if="input.type === 'textarea'" v-model="inputValue" :placeholder="input.placeholder || undefined" :autocomplete="input.autocomplete">
+				<template #label>{{ input.placeholder }}</template>
+				<template #caption>
+					<span v-if="okButtonDisabled && disabledReason === 'charactersExceeded'" v-text="i18n.t('_dialog.charactersExceeded', { current: (inputValue as string).length, max: input.maxLength ?? 'NaN' })"/>
+					<span v-else-if="okButtonDisabled && disabledReason === 'charactersBelow'" v-text="i18n.t('_dialog.charactersBelow', { current: (inputValue as string).length, min: input.minLength ?? 'NaN' })"/>
+				</template>
+			</MkTextarea>
+		</template>
 		<MkSelect v-if="select" v-model="selectedValue" autofocus>
 			<template v-if="select.items">
 				<option v-for="item in select.items" :value="item.value">{{ item.text }}</option>
@@ -61,10 +70,11 @@ import MkModal from '@/components/MkModal.vue';
 import MkButton from '@/components/MkButton.vue';
 import MkInput from '@/components/MkInput.vue';
 import MkSelect from '@/components/MkSelect.vue';
+import MkTextarea from '@/components/MkTextarea.vue';
 import { i18n } from '@/i18n';
 
 type Input = {
-	type: 'text' | 'number' | 'password' | 'email' | 'url' | 'date' | 'time' | 'search' | 'datetime-local';
+	type: 'text' | 'number' | 'password' | 'email' | 'url' | 'date' | 'time' | 'search' | 'datetime-local' | 'textarea';
 	placeholder?: string | null;
 	autocomplete?: string;
 	default: string | number | null;
diff --git a/packages/frontend/src/os.ts b/packages/frontend/src/os.ts
index 2e80e3d8d..feb33f4fa 100644
--- a/packages/frontend/src/os.ts
+++ b/packages/frontend/src/os.ts
@@ -251,7 +251,7 @@ export function actions<T extends {
 }
 
 export function inputText(props: {
-	type?: 'text' | 'email' | 'password' | 'url';
+	type?: 'text' | 'email' | 'password' | 'url' | 'textarea';
 	title?: string | null;
 	text?: string | null;
 	placeholder?: string | null;
diff --git a/packages/frontend/src/pages/custom-emojis-manager.vue b/packages/frontend/src/pages/custom-emojis-manager.vue
index cd533918d..62185889d 100644
--- a/packages/frontend/src/pages/custom-emojis-manager.vue
+++ b/packages/frontend/src/pages/custom-emojis-manager.vue
@@ -228,6 +228,7 @@ const setCategoryBulk = async () => {
 
 const setLicenseBulk = async () => {
 	const { canceled, result } = await os.inputText({
+		type: 'textarea',
 		title: 'License',
 	});
 	if (canceled) return;

From 9902d0633443b54df3895629d2b2ab445d34a288 Mon Sep 17 00:00:00 2001
From: riku6460 <17585784+riku6460@users.noreply.github.com>
Date: Tue, 17 Oct 2023 14:12:01 +0900
Subject: [PATCH 3/4] =?UTF-8?q?=E3=83=AD=E3=83=BC=E3=83=AB=E3=82=BF?=
 =?UTF-8?q?=E3=82=A4=E3=83=A0=E3=83=A9=E3=82=A4=E3=83=B3=E3=81=A7=20renote?=
 =?UTF-8?q?,=20reply=20=E3=82=92=20pack=20=E3=81=99=E3=82=8B=E3=82=88?=
 =?UTF-8?q?=E3=81=86=E3=81=AB=20(MisskeyIO#183)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

local-timeline からそのまま持ってきた

https://github.com/misskey-dev/misskey/issues/11940
---
 .../src/server/api/stream/channels/role-timeline.ts | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/packages/backend/src/server/api/stream/channels/role-timeline.ts b/packages/backend/src/server/api/stream/channels/role-timeline.ts
index 76b587534..7ad20528c 100644
--- a/packages/backend/src/server/api/stream/channels/role-timeline.ts
+++ b/packages/backend/src/server/api/stream/channels/role-timeline.ts
@@ -46,6 +46,19 @@ class RoleTimelineChannel extends Channel {
 			}
 			if (note.visibility !== 'public') return;
 
+			// リプライなら再pack
+			if (note.replyId != null) {
+				note.reply = await this.noteEntityService.pack(note.replyId, this.user, {
+					detail: true,
+				});
+			}
+			// Renoteなら再pack
+			if (note.renoteId != null) {
+				note.renote = await this.noteEntityService.pack(note.renoteId, this.user, {
+					detail: true,
+				});
+			}
+
 			// 流れてきたNoteがミュートしているユーザーが関わるものだったら無視する
 			if (isUserRelated(note, this.userIdsWhoMeMuting)) return;
 			// 流れてきたNoteがブロックされているユーザーが関わるものだったら無視する

From 6ae8e47d7567deb5f557daf8095063ce53ac8a55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=BE=E3=81=A3=E3=81=A1=E3=82=83=E3=81=A8=E3=83=BC?=
 =?UTF-8?q?=E3=81=AB=E3=82=85?=
 <17376330+u1-liquid@users.noreply.github.com>
Date: Tue, 17 Oct 2023 14:12:23 +0900
Subject: [PATCH 4/4] Bump up version to 13.14.2-io.11 (MisskeyIO#184)

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index f2eace72d..edee573a2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "13.14.2-io.10",
+	"version": "13.14.2-io.11",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",