From 1456d4904221af7d777612e3b05da14f0641e6b1 Mon Sep 17 00:00:00 2001
From: mattyatea <mattyatea@pm.me>
Date: Sat, 30 Dec 2023 08:53:47 +0900
Subject: [PATCH] bug fix

---
 .../api/endpoints/admin/emoji/add-request.ts      |  2 +-
 .../src/server/api/endpoints/admin/emoji/add.ts   |  3 +--
 packages/frontend/src/pages/settings/general.vue  |  3 ---
 packages/frontend/src/pages/user/home.vue         | 15 +++++----------
 packages/frontend/src/store.ts                    |  4 ----
 5 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/add-request.ts b/packages/backend/src/server/api/endpoints/admin/emoji/add-request.ts
index b10f7d088d..147073c2b4 100644
--- a/packages/backend/src/server/api/endpoints/admin/emoji/add-request.ts
+++ b/packages/backend/src/server/api/endpoints/admin/emoji/add-request.ts
@@ -44,6 +44,7 @@ export const paramDef = {
 		isSensitive: { type: 'boolean', nullable: true },
 		localOnly: { type: 'boolean', nullable: true },
 		fileId: { type: 'string', format: 'misskey:id' },
+		isNotifyIsHome: { type: 'boolean', nullable: true },
 	},
 	required: ['name', 'fileId'],
 } as const;
@@ -86,7 +87,6 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 					aliases: ps.aliases ?? [],
 					license: ps.license ?? null,
 					host: null,
-					draft: false,
 					isSensitive: ps.isSensitive ?? false,
 					localOnly: ps.localOnly ?? false,
 					roleIdsThatCanBeUsedThisEmojiAsReaction: [],
diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/add.ts b/packages/backend/src/server/api/endpoints/admin/emoji/add.ts
index 8c1f61f40d..85e3dfc7ea 100644
--- a/packages/backend/src/server/api/endpoints/admin/emoji/add.ts
+++ b/packages/backend/src/server/api/endpoints/admin/emoji/add.ts
@@ -58,7 +58,7 @@ export const paramDef = {
 			},
 		},
 	},
-	required: ['name', 'fileId', 'draft'],
+	required: ['name', 'fileId'],
 } as const;
 
 // TODO: ロジックをサービスに切り出す
@@ -87,7 +87,6 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				license: ps.license ?? null,
 				isSensitive: ps.isSensitive ?? false,
 				localOnly: ps.localOnly ?? false,
-				draft: false,
 				roleIdsThatCanBeUsedThisEmojiAsReaction: ps.roleIdsThatCanBeUsedThisEmojiAsReaction ?? [],
 			}, me);
 
diff --git a/packages/frontend/src/pages/settings/general.vue b/packages/frontend/src/pages/settings/general.vue
index 925d8d88fc..a41ba9cc92 100644
--- a/packages/frontend/src/pages/settings/general.vue
+++ b/packages/frontend/src/pages/settings/general.vue
@@ -36,7 +36,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 				<MkButton v-else danger @click="removePinnedList()"><i class="ti ti-trash"></i> {{ i18n.ts.remove }}</MkButton>
 			</MkFolder>
         <MkSwitch v-model="showMediaTimeline">{{ i18n.ts.showMediaTimeline}}<template #caption>{{ i18n.ts.showMediaTimelineInfo }} </template></MkSwitch>
-        <MkSwitch v-model="FeaturedOrNote">{{ i18n.ts.FeaturedOrNote}}<template #caption>{{ i18n.ts.FeaturedOrNoteInfo }} </template></MkSwitch>
         <MkSwitch v-model="showGlobalTimeline">{{ i18n.ts.showGlobalTimeline }}</MkSwitch>
 		</div>
 	</FormSection>
@@ -325,7 +324,6 @@ const enablehanntenn = computed(defaultStore.makeGetterSetter('enablehanntenn'))
 const showMediaTimeline = computed(defaultStore.makeGetterSetter('showMediaTimeline'));
 const showGlobalTimeline = computed(defaultStore.makeGetterSetter('showGlobalTimeline'));
 const showVisibilityColor = computed(defaultStore.makeGetterSetter('showVisibilityColor'))
-const FeaturedOrNote = computed(defaultStore.makeGetterSetter('FeaturedOrNote'))
 const disableStreamingTimeline = computed(defaultStore.makeGetterSetter('disableStreamingTimeline'));
 const useGroupedNotifications = computed(defaultStore.makeGetterSetter('useGroupedNotifications'));
 const enableSeasonalScreenEffect = computed(defaultStore.makeGetterSetter('enableSeasonalScreenEffect'));
@@ -392,7 +390,6 @@ watch([
 	showMediaTimeline,
   showVisibilityColor,
   enableonlyAndWithSave,
-  FeaturedOrNote,
   showGlobalTimeline,
 	disableStreamingTimeline,
 	enableSeasonalScreenEffect,
diff --git a/packages/frontend/src/pages/user/home.vue b/packages/frontend/src/pages/user/home.vue
index aa88473dfc..96cfb2c3e7 100644
--- a/packages/frontend/src/pages/user/home.vue
+++ b/packages/frontend/src/pages/user/home.vue
@@ -148,17 +148,10 @@ SPDX-License-Identifier: AGPL-3.0-only
 						<XActivity :key="user.id" :user="user"/>
           </MkLazy>
 				</template>
-          <div v-if="!defaultStore.state.FeaturedOrNote">
-            <div v-if="!disableNotes">
-              <MkLazy>
-						<XTimeline :user="user"/>
-              </MkLazy>
+            <div>
+                <div style="margin-bottom: 8px;">{{ i18n.ts._sfx.note }}</div>
+                <MkNotes :class="$style.tl" :noGap="true" :pagination="Notes"/>
             </div>
-          </div>
-          <div v-else>
-            <div style="margin-bottom: 8px;">{{ i18n.ts._sfx.note }}</div>
-            <MkNotes :class="$style.tl" :noGap="true" :pagination="Notes"/>
-          </div>
         </div>
       </div>
       <div v-if="!narrow" class="sub _gaps" style="container-type: inline-size;">
@@ -195,6 +188,8 @@ import {isFollowingVisibleForMe, isFollowersVisibleForMe} from '@/scripts/isFfVi
 import MkNotifyButton from "@/components/MkNotifyButton.vue";
 import MkRemoteInfoUpdate from "@/components/MkRemoteInfoUpdate.vue";
 import {defaultStore} from '@/store.js';
+import MkNotes from "@/components/MkNotes.vue";
+import MkLazy from "@/components/global/MkLazy.vue";
 
 function calcAge(birthdate: string): number {
   const date = new Date(birthdate);
diff --git a/packages/frontend/src/store.ts b/packages/frontend/src/store.ts
index 6077810d76..d5adf47c28 100644
--- a/packages/frontend/src/store.ts
+++ b/packages/frontend/src/store.ts
@@ -478,10 +478,6 @@ export const defaultStore = markRaw(new Storage('base', {
 		where: 'device',
 		default: false,
 	},
-	FeaturedOrNote: {
-		where: 'device',
-		default: false
-	},
 	tlWithReplies: {
 		where: 'device',
 		default: false,