From 6181bdb55fa0e864d2a6baa6f1eaba96eadf5ade Mon Sep 17 00:00:00 2001
From: kakkokari-gtyih <daisho7308+f@gmail.com>
Date: Fri, 24 Nov 2023 20:57:56 +0900
Subject: [PATCH 1/3] =?UTF-8?q?(fix)=20=E3=83=8F=E3=82=A4=E3=83=A9?=
 =?UTF-8?q?=E3=82=A4=E3=83=88=E3=81=8C=E3=81=AA=E3=81=84=E5=A0=B4=E5=90=88?=
 =?UTF-8?q?=E3=81=AF=E7=9B=B4=E8=BF=91=E3=81=AE=E3=83=8E=E3=83=BC=E3=83=88?=
 =?UTF-8?q?=E3=81=AB=E3=83=95=E3=82=A9=E3=83=BC=E3=83=AB=E3=83=90=E3=83=83?=
 =?UTF-8?q?=E3=82=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/frontend/src/components/MkNotes.vue | 10 +++++----
 packages/frontend/src/pages/user/home.vue    | 22 +++++++++++++++++---
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/packages/frontend/src/components/MkNotes.vue b/packages/frontend/src/components/MkNotes.vue
index 7af31074db95..98f2b7473f38 100644
--- a/packages/frontend/src/components/MkNotes.vue
+++ b/packages/frontend/src/components/MkNotes.vue
@@ -6,10 +6,12 @@ SPDX-License-Identifier: AGPL-3.0-only
 <template>
 <MkPagination ref="pagingComponent" :pagination="pagination" :disableAutoLoad="disableAutoLoad">
 	<template #empty>
-		<div class="_fullinfo">
-			<img :src="infoImageUrl" class="_ghost"/>
-			<div>{{ i18n.ts.noNotes }}</div>
-		</div>
+		<slot name="empty">
+			<div class="_fullinfo">
+				<img :src="infoImageUrl" class="_ghost"/>
+				<div>{{ i18n.ts.noNotes }}</div>
+			</div>
+		</slot>
 	</template>
 
 	<template #default="{ items: notes }">
diff --git a/packages/frontend/src/pages/user/home.vue b/packages/frontend/src/pages/user/home.vue
index 75df1f666bed..101e9093c7ca 100644
--- a/packages/frontend/src/pages/user/home.vue
+++ b/packages/frontend/src/pages/user/home.vue
@@ -133,7 +133,11 @@ SPDX-License-Identifier: AGPL-3.0-only
 				</template>
 				<div v-if="!disableNotes">
 					<div style="margin-bottom: 8px;">{{ i18n.ts.featured }}</div>
-					<MkNotes :class="$style.tl" :noGap="true" :pagination="pagination"/>
+					<MkNotes :class="$style.tl" :noGap="true" :pagination="pagination">
+						<template #empty>
+							<MkNotes :class="$style.tl" :noGap="true" :pagination="fallbackPagination"></MkNotes>
+						</template>
+					</MkNotes>
 				</div>
 			</div>
 		</div>
@@ -148,6 +152,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 <script lang="ts" setup>
 import { defineAsyncComponent, computed, onMounted, onUnmounted, nextTick, watch, provide } from 'vue';
 import * as Misskey from 'misskey-js';
+import type { Paging } from '@/components/MkPagination.vue';
 import MkNote from '@/components/MkNote.vue';
 import MkFollowButton from '@/components/MkFollowButton.vue';
 import MkAccountMoved from '@/components/MkAccountMoved.vue';
@@ -217,8 +222,8 @@ watch($$(moderationNote), async () => {
 	await os.api('admin/update-user-note', { userId: props.user.id, text: moderationNote });
 });
 
-const pagination = {
-	endpoint: 'users/featured-notes' as const,
+const pagination: Paging = {
+	endpoint: 'users/featured-notes',
 	limit: 10,
 	params: computed(() => ({
 		userId: props.user.id,
@@ -226,6 +231,17 @@ const pagination = {
 	})),
 };
 
+const fallbackPagination: Paging = {
+	endpoint: 'users/notes',
+	limit: 10,
+	params: computed(() => ({
+		userId: props.user.id,
+		withChannelNotes: true,
+		withRenotes: true,
+		withReplies: false,
+	})),
+};
+
 const style = $computed(() => {
 	if (props.user.bannerUrl == null) return {};
 	return {

From c7ac80ab632b5e9af7fb5c19ce1ce1f0cf36bf1f Mon Sep 17 00:00:00 2001
From: kakkokari-gtyih <daisho7308+f@gmail.com>
Date: Fri, 24 Nov 2023 20:58:48 +0900
Subject: [PATCH 2/3] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index da9f45b1df38..3d07dc01bba8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -34,6 +34,7 @@
 - リアクションの横幅を150pxに制限するかどうかユーザーが選べるように
 - Fix: ハードミュートにノート引っかかるとエラーが発生しTLが更新されないことがある問題
 - Fix: 絵文字入力時のサジェストがおかしい
+- Fix: ユーザーページでハイライトノートがない場合は直近のノートを表示するように修正
 
 ### Server
 

From 65e414035621145fc227fcfd123d823f36d59a27 Mon Sep 17 00:00:00 2001
From: anatawa12 <anatawa12@icloud.com>
Date: Thu, 30 Nov 2023 16:07:55 +0900
Subject: [PATCH 3/3] =?UTF-8?q?chore:=20=E4=BD=BF=E3=82=8F=E3=82=8C?=
 =?UTF-8?q?=E3=81=A6=E3=81=84=E3=81=AA=E3=81=84includeSensitiveChannel?=
 =?UTF-8?q?=E6=8C=87=E5=AE=9A=E3=82=92=E5=89=8A=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/frontend/src/pages/user/home.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/frontend/src/pages/user/home.vue b/packages/frontend/src/pages/user/home.vue
index 101e9093c7ca..2c863a4adac5 100644
--- a/packages/frontend/src/pages/user/home.vue
+++ b/packages/frontend/src/pages/user/home.vue
@@ -227,7 +227,6 @@ const pagination: Paging = {
 	limit: 10,
 	params: computed(() => ({
 		userId: props.user.id,
-		includeSensitiveChannel: $i != null,
 	})),
 };