From fe16b5453b218989583cec8e97942850333d2fe4 Mon Sep 17 00:00:00 2001
From: yukineko <27853966+hideki0403@users.noreply.github.com>
Date: Thu, 11 Apr 2024 21:58:45 +0900
Subject: [PATCH 1/8] =?UTF-8?q?fix:=20=E6=94=AF=E6=8F=B4=E8=80=85=E6=95=B0?=
 =?UTF-8?q?=E3=81=8C=E6=AD=A3=E3=81=97=E3=81=8F=E8=A1=A8=E7=A4=BA=E3=81=95?=
 =?UTF-8?q?=E3=82=8C=E3=81=AA=E3=81=84=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../backend/src/core/integrations/FanboxManagementService.ts    | 2 +-
 .../backend/src/core/integrations/PatreonManagementService.ts   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/backend/src/core/integrations/FanboxManagementService.ts b/packages/backend/src/core/integrations/FanboxManagementService.ts
index 7dbdfe138b31..56604df306b6 100644
--- a/packages/backend/src/core/integrations/FanboxManagementService.ts
+++ b/packages/backend/src/core/integrations/FanboxManagementService.ts
@@ -128,7 +128,7 @@ export class FanboxManagementService implements OnApplicationShutdown {
 				});
 			}
 
-			this.logger.info(`Found ${Object.keys(usersList).length} fanbox supporter(s)`);
+			this.logger.info(`Found ${usersList.size} fanbox supporter(s)`);
 			this.logger.info('Cache updated.');
 		} catch (err: any) {
 			this.logger.error('Failed to update fanbox supporter cache');
diff --git a/packages/backend/src/core/integrations/PatreonManagementService.ts b/packages/backend/src/core/integrations/PatreonManagementService.ts
index 27826d547676..1641a1abad65 100644
--- a/packages/backend/src/core/integrations/PatreonManagementService.ts
+++ b/packages/backend/src/core/integrations/PatreonManagementService.ts
@@ -136,7 +136,7 @@ export class PatreonManagementService implements OnApplicationShutdown {
 				});
 			}
 
-			this.logger.info(`Found ${Object.keys(usersList).length} patreon(s)`);
+			this.logger.info(`Found ${usersList.size} patreon(s)`);
 		} catch (err: any) {
 			this.logger.error('Failed to fetch patreon users');
 			this.logger.error(err);

From 453dd4b7676e923360e85ba4215938894855c43d Mon Sep 17 00:00:00 2001
From: yukineko <27853966+hideki0403@users.noreply.github.com>
Date: Fri, 12 Apr 2024 02:09:45 +0900
Subject: [PATCH 2/8] =?UTF-8?q?refactor:=20=E6=99=82=E9=99=90=E3=83=8E?=
 =?UTF-8?q?=E3=83=BC=E3=83=88=E3=81=A71=E5=B9=B4=E4=BB=A5=E4=B8=8A?=
 =?UTF-8?q?=E5=BE=8C=E3=81=AE=E6=97=A5=E6=99=82=E3=82=92=E6=8C=87=E5=AE=9A?=
 =?UTF-8?q?=E3=81=A7=E3=81=8D=E3=81=AA=E3=81=84=E3=82=88=E3=81=86=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 locales/index.d.ts                            |  4 +
 locales/ja-JP.yml                             |  1 +
 .../src/server/api/endpoints/notes/create.ts  | 10 +++
 .../src/components/MkDeleteScheduleEditor.vue | 79 ++++++++++++-------
 .../frontend/src/components/MkPostForm.vue    |  3 +
 5 files changed, 67 insertions(+), 30 deletions(-)

diff --git a/locales/index.d.ts b/locales/index.d.ts
index 6d1a56535641..e9850724a6a1 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -5272,6 +5272,10 @@ export interface Locale extends ILocale {
      * このノートは{time}に消滅します
      */
     "noteDeletationAt": ParameterizedString<"time">;
+    /**
+     * 1年以上先の日時を指定することはできません
+     */
+    "cannotScheduleLaterThanOneYear": string;
     /**
      * アクティビティを非公開にする
      */
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index c0fc642cec25..7bc4455582dd 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -1314,6 +1314,7 @@ surrender: "やめる"
 gameRetry: "リトライ"
 scheduledNoteDelete: "ノートの自己消滅"
 noteDeletationAt: "このノートは{time}に消滅します"
+cannotScheduleLaterThanOneYear: "1年以上先の日時を指定することはできません"
 hideActivity: "アクティビティを非公開にする"
 hideActivityDescription: "自分のプロフィールのアクティビティ (概要/アクティビティタブ) を他人が見れないようにします。このオプションを有効にしても、自分であればプロフィールのアクティビティタブから引き続き閲覧できます。"
 channelAnnouncementDescription: "このお知らせはチャンネルのタイムライン上部に表示されます。最初の1行がタイトルとして表示され、2行目以降はお知らせをタップすることで表示されるようになります。"
diff --git a/packages/backend/src/server/api/endpoints/notes/create.ts b/packages/backend/src/server/api/endpoints/notes/create.ts
index 0ea945da6036..5fa674a7f839 100644
--- a/packages/backend/src/server/api/endpoints/notes/create.ts
+++ b/packages/backend/src/server/api/endpoints/notes/create.ts
@@ -103,6 +103,12 @@ export const meta = {
 			id: '05655b05-5a09-47c3-af56-de0c0900791a',
 		},
 
+		cannotScheduleDeleteLaterThanOneYear: {
+			message: 'Scheduled delete time is later than one year.',
+			code: 'CANNOT_SCHEDULE_DELETE_LATER_THAN_ONE_YEAR',
+			id: 'b02b5edb-2741-4841-b692-d9893f1e6515',
+		},
+
 		noSuchChannel: {
 			message: 'No such channel.',
 			code: 'NO_SUCH_CHANNEL',
@@ -375,6 +381,10 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				} else if (typeof ps.scheduledDelete.deleteAfter === 'number') {
 					ps.scheduledDelete.deleteAt = Date.now() + ps.scheduledDelete.deleteAfter;
 				}
+
+				if (ps.scheduledDelete.deleteAt && ps.scheduledDelete.deleteAt > Date.now() + ms('1year')) {
+					throw new ApiError(meta.errors.cannotScheduleDeleteLaterThanOneYear);
+				}
 			}
 
 			let channel: MiChannel | null = null;
diff --git a/packages/frontend/src/components/MkDeleteScheduleEditor.vue b/packages/frontend/src/components/MkDeleteScheduleEditor.vue
index 1b15fbc064ae..3d6d4c4b507b 100644
--- a/packages/frontend/src/components/MkDeleteScheduleEditor.vue
+++ b/packages/frontend/src/components/MkDeleteScheduleEditor.vue
@@ -4,8 +4,9 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<div class="zmdxowus">
+<div :class="$style.root">
 	<span>{{ i18n.ts.scheduledNoteDelete }}</span>
+	<MkInfo v-if="!isValid" warn>{{ i18n.ts.cannotScheduleLaterThanOneYear }}</MkInfo>
 	<section>
 		<div>
 			<MkSelect v-model="expiration" small>
@@ -41,6 +42,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 import { ref, watch } from 'vue';
 import MkInput from './MkInput.vue';
 import MkSelect from './MkSelect.vue';
+import MkInfo from './MkInfo.vue';
 import { formatDateTimeString } from '@/scripts/format-time-string.js';
 import { addTime } from '@/scripts/time.js';
 import { i18n } from '@/i18n.js';
@@ -48,6 +50,7 @@ import { i18n } from '@/i18n.js';
 export type DeleteScheduleEditorModelValue = {
 	deleteAt: number | null;
 	deleteAfter: number | null;
+	isValid: boolean;
 };
 
 const props = defineProps<{
@@ -57,11 +60,12 @@ const emit = defineEmits<{
 	(ev: 'update:modelValue', v: DeleteScheduleEditorModelValue): void;
 }>();
 
-const expiration = ref('at');
+const expiration = ref<'at' | 'after'>('at');
 const atDate = ref(formatDateTimeString(addTime(new Date(), 1, 'day'), 'yyyy-MM-dd'));
 const atTime = ref('00:00');
 const after = ref(0);
 const unit = ref('second');
+const isValid = ref(true);
 
 if (props.modelValue.deleteAt) {
 	expiration.value = 'at';
@@ -73,39 +77,56 @@ if (props.modelValue.deleteAt) {
 	after.value = props.modelValue.deleteAfter / 1000;
 }
 
-function get(): DeleteScheduleEditorModelValue {
-	const calcAt = () => {
-		return new Date(`${atDate.value} ${atTime.value}`).getTime();
-	};
-
-	const calcAfter = () => {
-		let base = parseInt(after.value.toString());
-		switch (unit.value) {
-			// @ts-expect-error fallthrough
-			case 'day': base *= 24;
-			// @ts-expect-error fallthrough
-			case 'hour': base *= 60;
-			// @ts-expect-error fallthrough
-			case 'minute': base *= 60;
-			// eslint-disable-next-line no-fallthrough
-			case 'second': return base *= 1000;
-			default: return null;
-		}
-	};
+const calcAt = () => {
+	return new Date(`${atDate.value} ${atTime.value}`).getTime();
+};
 
-	return {
+const calcAfter = () => {
+	let base = parseInt(after.value.toString());
+	switch (unit.value) {
+		// @ts-expect-error fallthrough
+		case 'day': base *= 24;
+		// @ts-expect-error fallthrough
+		case 'hour': base *= 60;
+		// @ts-expect-error fallthrough
+		case 'minute': base *= 60;
+		// eslint-disable-next-line no-fallthrough
+		case 'second': return base *= 1000;
+		default: return null;
+	}
+};
+
+const isValidTime = () => {
+	if (expiration.value === 'at') {
+		return calcAt() < Date.now() + (1000 * 60 * 60 * 24 * 365);
+	} else {
+		const afterMs = calcAfter();
+		if (afterMs === null) return false;
+		return afterMs < 1000 * 60 * 60 * 24 * 365;
+	}
+};
+
+isValid.value = isValidTime();
+
+watch([expiration, atDate, atTime, after, unit, isValid], () => {
+	const isValidTimeValue = isValidTime();
+	isValid.value = isValidTimeValue;
+
+	emit('update:modelValue', {
 		deleteAt: expiration.value === 'at' ? calcAt() : null,
 		deleteAfter: expiration.value === 'after' ? calcAfter() : null,
-	};
-}
-
-watch([expiration, atDate, atTime, after, unit], () => emit('update:modelValue', get()), {
+		isValid: isValidTimeValue,
+	});
+}, {
 	deep: true,
 });
 </script>
 
-<style lang="scss" scoped>
-.zmdxowus {
+<style lang="scss" module>
+.root {
+	display: flex;
+	flex-direction: column;
+	gap: 16px;
 	padding: 8px 16px;
 
 	>span {
@@ -136,8 +157,6 @@ watch([expiration, atDate, atTime, after, unit], () => emit('update:modelValue',
 	}
 
 	>section {
-		margin: 16px 0 0 0;
-
 		>div {
 			margin: 0 8px;
 			display: flex;
diff --git a/packages/frontend/src/components/MkPostForm.vue b/packages/frontend/src/components/MkPostForm.vue
index 6cb108b3e368..da11a33e755f 100644
--- a/packages/frontend/src/components/MkPostForm.vue
+++ b/packages/frontend/src/components/MkPostForm.vue
@@ -252,6 +252,7 @@ const maxTextLength = computed((): number => {
 
 const canPost = computed((): boolean => {
 	return !props.mock && !posting.value && !posted.value &&
+		(scheduledNoteDelete.value ? scheduledNoteDelete.value.isValid : true) &&
 		(1 <= textLength.value || 1 <= files.value.length || !!poll.value || !!props.renote) &&
 		(textLength.value <= maxTextLength.value) &&
 		(!poll.value || poll.value.choices.length >= 2);
@@ -451,6 +452,7 @@ function toggleScheduledNoteDelete() {
 		scheduledNoteDelete.value = {
 			deleteAt: null,
 			deleteAfter: null,
+			isValid: true,
 		};
 	}
 }
@@ -1039,6 +1041,7 @@ onMounted(() => {
 				scheduledNoteDelete.value = {
 					deleteAt: init.deleteAt ? (new Date(init.deleteAt)).getTime() : null,
 					deleteAfter: null,
+					isValid: true,
 				};
 			}
 			visibility.value = init.visibility;

From 8154bdac5428864a1c3e48887e40f6857ad997f5 Mon Sep 17 00:00:00 2001
From: yukineko <27853966+hideki0403@users.noreply.github.com>
Date: Fri, 12 Apr 2024 15:08:40 +0900
Subject: [PATCH 3/8] =?UTF-8?q?feat:=20=E3=83=8E=E3=83=BC=E3=83=88?=
 =?UTF-8?q?=E5=86=85=E3=81=AB=E3=81=82=E3=82=8B=E7=B5=B5=E6=96=87=E5=AD=97?=
 =?UTF-8?q?=E3=82=92=E7=B5=B5=E6=96=87=E5=AD=97=E3=83=94=E3=83=83=E3=82=AB?=
 =?UTF-8?q?=E3=83=BC=E3=81=AB=E8=BF=BD=E5=8A=A0=E3=81=A7=E3=81=8D=E3=82=8B?=
 =?UTF-8?q?=E6=A9=9F=E8=83=BD=E3=82=92=E5=AE=9F=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 locales/index.d.ts                                        | 4 ++++
 locales/ja-JP.yml                                         | 1 +
 packages/frontend/src/components/global/MkCustomEmoji.vue | 6 ++++++
 3 files changed, 11 insertions(+)

diff --git a/locales/index.d.ts b/locales/index.d.ts
index e9850724a6a1..a98fe68b4209 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -5300,6 +5300,10 @@ export interface Locale extends ILocale {
      * 投稿フォームをリセット
      */
     "clearPost": string;
+    /**
+     * 絵文字ピッカーに追加
+     */
+    "addToEmojiPicker": string;
     "_bubbleGame": {
         /**
          * 遊び方
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 7bc4455582dd..18ae5a284d50 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -1321,6 +1321,7 @@ channelAnnouncementDescription: "このお知らせはチャンネルのタイ
 postForm: "投稿フォーム"
 postFormBottomSettingsDescription: "投稿フォームの下部に表示される項目の並び替えが出来ます。項目をクリックすると削除できます。"
 clearPost: "投稿フォームをリセット"
+addToEmojiPicker: "絵文字ピッカーに追加"
 
 _bubbleGame:
   howToPlay: "遊び方"
diff --git a/packages/frontend/src/components/global/MkCustomEmoji.vue b/packages/frontend/src/components/global/MkCustomEmoji.vue
index f0138ff5ef7c..ca6d8e7e6193 100644
--- a/packages/frontend/src/components/global/MkCustomEmoji.vue
+++ b/packages/frontend/src/components/global/MkCustomEmoji.vue
@@ -103,6 +103,12 @@ function onClick(ev: MouseEvent) {
 				react(`:${props.name}:`);
 				sound.playMisskeySfx('reaction');
 			},
+		}] : []), ...(!defaultStore.state.reactions.includes(`:${props.name}:`) ? [{
+			text: i18n.ts.addToEmojiPicker,
+			icon: 'ti ti-plus',
+			action: () => {
+				defaultStore.set('reactions', [...defaultStore.state.reactions, `:${props.name}:`]);
+			},
 		}] : []), {
 			text: i18n.ts.info,
 			icon: 'ti ti-info-circle',

From 37c8a4dba66cff15409fda4753ab611a96eb74ab Mon Sep 17 00:00:00 2001
From: yukineko <27853966+hideki0403@users.noreply.github.com>
Date: Fri, 12 Apr 2024 16:50:49 +0900
Subject: [PATCH 4/8] =?UTF-8?q?feat:=20=E3=83=AA=E3=82=A2=E3=82=AF?=
 =?UTF-8?q?=E3=82=B7=E3=83=A7=E3=83=B3=E3=81=97=E3=81=9F=E7=B5=B5=E6=96=87?=
 =?UTF-8?q?=E5=AD=97=E3=82=92=E7=B5=B5=E6=96=87=E5=AD=97=E3=83=94=E3=83=83?=
 =?UTF-8?q?=E3=82=AB=E3=83=BC=E3=81=AB=E8=BF=BD=E5=8A=A0=E3=81=A7=E3=81=8D?=
 =?UTF-8?q?=E3=82=8B=E6=A9=9F=E8=83=BD=E3=82=92=E5=AE=9F=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/MkReactionsViewer.reaction.vue  | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/packages/frontend/src/components/MkReactionsViewer.reaction.vue b/packages/frontend/src/components/MkReactionsViewer.reaction.vue
index 33ca5ffe3dd5..6ef31bcc1126 100644
--- a/packages/frontend/src/components/MkReactionsViewer.reaction.vue
+++ b/packages/frontend/src/components/MkReactionsViewer.reaction.vue
@@ -67,6 +67,8 @@ const canToggle = computed(() => {
 });
 const canGetInfo = computed(() => !props.reaction.match(/@\w/) && props.reaction.includes(':'));
 
+const plainReaction = computed(() => customEmojisMap.has(emojiName.value) ? getReactionName(props.reaction, true) : props.reaction);
+
 async function toggleReaction() {
 	if (!canToggle.value) return;
 
@@ -118,9 +120,7 @@ async function toggleReaction() {
 }
 
 async function menu(ev) {
-	if (!canGetInfo.value) return;
-
-	os.popupMenu([{
+	os.popupMenu([...(canGetInfo.value ? [{
 		text: i18n.ts.info,
 		icon: 'ti ti-info-circle',
 		action: async () => {
@@ -130,7 +130,13 @@ async function menu(ev) {
 				}),
 			});
 		},
-	}], ev.currentTarget ?? ev.target);
+	}] : []), ...(emoji.value && !defaultStore.state.reactions.includes(plainReaction.value) ? [{
+		text: i18n.ts.addToEmojiPicker,
+		icon: 'ti ti-plus',
+		action: async () => {
+			defaultStore.set('reactions', [...defaultStore.state.reactions, plainReaction.value]);
+		},
+	}] : [])], ev.currentTarget ?? ev.target);
 }
 
 function anime() {

From 9f02320aa484e1da6fdb067ff4580006378f53ce Mon Sep 17 00:00:00 2001
From: yukineko <27853966+hideki0403@users.noreply.github.com>
Date: Fri, 12 Apr 2024 17:30:53 +0900
Subject: [PATCH 5/8] =?UTF-8?q?feat:=20=E3=83=AA=E3=82=A2=E3=82=AF?=
 =?UTF-8?q?=E3=82=B7=E3=83=A7=E3=83=B3=E6=95=B0=E3=81=AE=E9=9D=9E=E8=A1=A8?=
 =?UTF-8?q?=E7=A4=BA=E6=A9=9F=E8=83=BD=E3=82=92=E5=AE=9F=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 locales/index.d.ts                            | 22 +++++++++++++++++++
 locales/ja-JP.yml                             |  6 +++++
 .../src/components/MkNoteDetailed.vue         | 11 +++++++++-
 .../components/MkReactionsViewer.reaction.vue | 12 +++++++++-
 .../frontend/src/pages/settings/general.vue   |  9 ++++++++
 packages/frontend/src/store.ts                |  4 ++++
 6 files changed, 62 insertions(+), 2 deletions(-)

diff --git a/locales/index.d.ts b/locales/index.d.ts
index a98fe68b4209..be45bcaf4a9a 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -5304,6 +5304,10 @@ export interface Locale extends ILocale {
      * 絵文字ピッカーに追加
      */
     "addToEmojiPicker": string;
+    /**
+     * リアクション数の非表示
+     */
+    "hideReactionCount": string;
     "_bubbleGame": {
         /**
          * 遊び方
@@ -10280,6 +10284,24 @@ export interface Locale extends ILocale {
          */
         "header": string;
     };
+    "_hideReactionCount": {
+        /**
+         * 非表示にしない
+         */
+        "none": string;
+        /**
+         * 自分のノートのみ
+         */
+        "self": string;
+        /**
+         * 自分以外のノートのみ
+         */
+        "others": string;
+        /**
+         * 全てのノート
+         */
+        "all": string;
+    };
 }
 declare const locales: {
     [lang: string]: Locale;
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 18ae5a284d50..d135f4d2a9fe 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -1322,6 +1322,7 @@ postForm: "投稿フォーム"
 postFormBottomSettingsDescription: "投稿フォームの下部に表示される項目の並び替えが出来ます。項目をクリックすると削除できます。"
 clearPost: "投稿フォームをリセット"
 addToEmojiPicker: "絵文字ピッカーに追加"
+hideReactionCount: "リアクション数の非表示"
 
 _bubbleGame:
   howToPlay: "遊び方"
@@ -2739,3 +2740,8 @@ _offlineScreen:
   title: "オフライン - サーバーに接続できません"
   header: "サーバーに接続できません"
 
+_hideReactionCount:
+  none: "非表示にしない"
+  self: "自分のノートのみ"
+  others: "自分以外のノートのみ"
+  all: "全てのノート"
diff --git a/packages/frontend/src/components/MkNoteDetailed.vue b/packages/frontend/src/components/MkNoteDetailed.vue
index a4d64f4a7f81..4f50887c97f9 100644
--- a/packages/frontend/src/components/MkNoteDetailed.vue
+++ b/packages/frontend/src/components/MkNoteDetailed.vue
@@ -167,7 +167,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 			<div :class="$style.reactionTabs">
 				<button v-for="reaction in Object.keys(appearNote.reactions)" :key="reaction" :class="[$style.reactionTab, { [$style.reactionTabActive]: reactionTabType === reaction }]" class="_button" @click="reactionTabType = reaction">
 					<MkReactionIcon :reaction="reaction"/>
-					<span style="margin-left: 4px;">{{ appearNote.reactions[reaction] }}</span>
+					<span v-if="!hideReactionCount" style="margin-left: 4px;">{{ appearNote.reactions[reaction] }}</span>
 				</button>
 			</div>
 			<MkPagination v-if="reactionTabType" :key="reactionTabType" :pagination="reactionsPagination" :disableAutoLoad="true">
@@ -283,6 +283,15 @@ const showTicker = (defaultStore.state.instanceTicker === 'always') || (defaultS
 const conversation = ref<Misskey.entities.Note[]>([]);
 const replies = ref<Misskey.entities.Note[]>([]);
 const canRenote = computed(() => ['public', 'home'].includes(appearNote.value.visibility) || appearNote.value.userId === $i?.id);
+const hideReactionCount = computed(() => {
+	switch (defaultStore.state.hideReactionCount) {
+		case 'none': return false;
+		case 'all': return true;
+		case 'self': return props.note.userId === $i?.id;
+		case 'others': return props.note.userId !== $i?.id;
+		default: return false;
+	}
+});
 
 const keymap = {
 	'r': () => reply(true),
diff --git a/packages/frontend/src/components/MkReactionsViewer.reaction.vue b/packages/frontend/src/components/MkReactionsViewer.reaction.vue
index 6ef31bcc1126..99d70ec90407 100644
--- a/packages/frontend/src/components/MkReactionsViewer.reaction.vue
+++ b/packages/frontend/src/components/MkReactionsViewer.reaction.vue
@@ -13,7 +13,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 	@contextmenu.prevent.stop="menu"
 >
 	<MkReactionIcon :class="defaultStore.state.limitWidthOfReaction ? $style.limitWidth : ''" :reaction="reaction" :emojiUrl="note.reactionEmojis[reaction.substring(1, reaction.length - 1)]"/>
-	<span :class="$style.count">{{ count }}</span>
+	<span v-if="!hideReactionCount" :class="$style.count">{{ count }}</span>
 </button>
 </template>
 
@@ -69,6 +69,16 @@ const canGetInfo = computed(() => !props.reaction.match(/@\w/) && props.reaction
 
 const plainReaction = computed(() => customEmojisMap.has(emojiName.value) ? getReactionName(props.reaction, true) : props.reaction);
 
+const hideReactionCount = computed(() => {
+	switch (defaultStore.state.hideReactionCount) {
+		case 'none': return false;
+		case 'all': return true;
+		case 'self': return props.note.userId === $i?.id;
+		case 'others': return props.note.userId !== $i?.id;
+		default: return false;
+	}
+});
+
 async function toggleReaction() {
 	if (!canToggle.value) return;
 
diff --git a/packages/frontend/src/pages/settings/general.vue b/packages/frontend/src/pages/settings/general.vue
index 0aba191dbaff..04b02a7809f5 100644
--- a/packages/frontend/src/pages/settings/general.vue
+++ b/packages/frontend/src/pages/settings/general.vue
@@ -80,6 +80,13 @@ SPDX-License-Identifier: AGPL-3.0-only
 					<option value="large">{{ i18n.ts.large }}</option>
 				</MkRadios>
 				<MkSwitch v-model="limitWidthOfReaction">{{ i18n.ts.limitWidthOfReaction }}</MkSwitch>
+				<MkSelect v-model="hideReactionCount">
+					<template #label>{{ i18n.ts.hideReactionCount }}<span class="_beta">{{ i18n.ts.originalFeature }}</span></template>
+					<option value="none">{{ i18n.ts._hideReactionCount.none }}</option>
+					<option value="self">{{ i18n.ts._hideReactionCount.self }}</option>
+					<option value="others">{{ i18n.ts._hideReactionCount.others }}</option>
+					<option value="all">{{ i18n.ts._hideReactionCount.all }}</option>
+				</MkSelect>
 			</div>
 
 			<MkSelect v-model="instanceTicker">
@@ -319,6 +326,7 @@ const showNoteActionsOnlyHover = computed(defaultStore.makeGetterSetter('showNot
 const showClipButtonInNoteFooter = computed(defaultStore.makeGetterSetter('showClipButtonInNoteFooter'));
 const reactionsDisplaySize = computed(defaultStore.makeGetterSetter('reactionsDisplaySize'));
 const limitWidthOfReaction = computed(defaultStore.makeGetterSetter('limitWidthOfReaction'));
+const hideReactionCount = computed(defaultStore.makeGetterSetter('hideReactionCount'));
 const collapseRenotes = computed(defaultStore.makeGetterSetter('collapseRenotes'));
 const collapseRenotesTrigger = computed(defaultStore.makeGetterSetter('collapseRenotesTrigger'));
 const collapseSelfRenotes = computed(defaultStore.makeGetterSetter('collapseSelfRenotes'));
@@ -393,6 +401,7 @@ watch([
 	showGapBetweenNotesInTimeline,
 	instanceTicker,
 	instanceTickerStyle,
+	hideReactionCount,
 	overridedDeviceKind,
 	mediaListWithOneImageAppearance,
 	reactionsDisplaySize,
diff --git a/packages/frontend/src/store.ts b/packages/frontend/src/store.ts
index a15ee7558a09..0a79262f8bc7 100644
--- a/packages/frontend/src/store.ts
+++ b/packages/frontend/src/store.ts
@@ -424,6 +424,10 @@ export const defaultStore = markRaw(new Storage('base', {
 		where: 'device',
 		default: 'medium' as 'small' | 'medium' | 'large',
 	},
+	hideReactionCount: {
+		where: 'account',
+		default: 'none' as 'none' | 'self' | 'others' | 'all',
+	},
 	limitWidthOfReaction: {
 		where: 'device',
 		default: true,

From 65d85bb4fe724dc0737f1ac7958bc13c96cc926d Mon Sep 17 00:00:00 2001
From: yukineko <27853966+hideki0403@users.noreply.github.com>
Date: Sun, 14 Apr 2024 14:31:10 +0900
Subject: [PATCH 6/8] =?UTF-8?q?feat:=20=E8=AA=B0=E3=81=8C=E3=83=AA?=
 =?UTF-8?q?=E3=82=A2=E3=82=AF=E3=82=B7=E3=83=A7=E3=83=B3=E3=82=92=E3=81=97?=
 =?UTF-8?q?=E3=81=9F=E3=81=AE=E3=81=8B=E3=82=92=E9=9D=9E=E8=A1=A8=E7=A4=BA?=
 =?UTF-8?q?=E3=81=AB=E3=81=A7=E3=81=8D=E3=82=8B=E6=A9=9F=E8=83=BD=E3=82=92?=
 =?UTF-8?q?=E5=AE=9F=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 locales/index.d.ts                                        | 8 ++++++++
 locales/ja-JP.yml                                         | 2 ++
 packages/frontend/src/components/MkNoteDetailed.vue       | 2 +-
 .../frontend/src/components/MkReactionsViewer.details.vue | 6 +++---
 .../src/components/MkReactionsViewer.reaction.vue         | 4 ++--
 packages/frontend/src/pages/settings/general.vue          | 6 ++++++
 packages/frontend/src/store.ts                            | 4 ++++
 7 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/locales/index.d.ts b/locales/index.d.ts
index be45bcaf4a9a..0cef75506fb9 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -5308,6 +5308,14 @@ export interface Locale extends ILocale {
      * リアクション数の非表示
      */
     "hideReactionCount": string;
+    /**
+     * 誰がリアクションをしたのかを非表示にする
+     */
+    "hideReactionUsers": string;
+    /**
+     * リアクションをホバーした際のユーザー一覧と、ノート詳細ページのリアクションタブにあるリアクションをしたユーザー一覧を非表示にします
+     */
+    "hideReactionUsersDescription": string;
     "_bubbleGame": {
         /**
          * 遊び方
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index d135f4d2a9fe..699ba9c7446c 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -1323,6 +1323,8 @@ postFormBottomSettingsDescription: "投稿フォームの下部に表示され
 clearPost: "投稿フォームをリセット"
 addToEmojiPicker: "絵文字ピッカーに追加"
 hideReactionCount: "リアクション数の非表示"
+hideReactionUsers: 誰がリアクションをしたのかを非表示にする
+hideReactionUsersDescription: "リアクションをホバーした際のユーザー一覧と、ノート詳細ページのリアクションタブにあるリアクションをしたユーザー一覧を非表示にします"
 
 _bubbleGame:
   howToPlay: "遊び方"
diff --git a/packages/frontend/src/components/MkNoteDetailed.vue b/packages/frontend/src/components/MkNoteDetailed.vue
index 4f50887c97f9..ff6a1e952271 100644
--- a/packages/frontend/src/components/MkNoteDetailed.vue
+++ b/packages/frontend/src/components/MkNoteDetailed.vue
@@ -165,7 +165,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 		</div>
 		<div v-else-if="tab === 'reactions'" :class="$style.tab_reactions">
 			<div :class="$style.reactionTabs">
-				<button v-for="reaction in Object.keys(appearNote.reactions)" :key="reaction" :class="[$style.reactionTab, { [$style.reactionTabActive]: reactionTabType === reaction }]" class="_button" @click="reactionTabType = reaction">
+				<button v-for="reaction in Object.keys(appearNote.reactions)" :key="reaction" :class="[$style.reactionTab, { [$style.reactionTabActive]: reactionTabType === reaction }]" class="_button" @click="reactionTabType = defaultStore.state.hideReactionUsers ? null : reaction">
 					<MkReactionIcon :reaction="reaction"/>
 					<span v-if="!hideReactionCount" style="margin-left: 4px;">{{ appearNote.reactions[reaction] }}</span>
 				</button>
diff --git a/packages/frontend/src/components/MkReactionsViewer.details.vue b/packages/frontend/src/components/MkReactionsViewer.details.vue
index 8b5e6efdf3c6..294a84109a4d 100644
--- a/packages/frontend/src/components/MkReactionsViewer.details.vue
+++ b/packages/frontend/src/components/MkReactionsViewer.details.vue
@@ -10,7 +10,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 			<MkReactionIcon :reaction="reaction" :class="$style.reactionIcon" :noStyle="true"/>
 			<div :class="$style.reactionName">{{ getReactionName(reaction) }}</div>
 		</div>
-		<div :class="$style.users">
+		<div v-if="users.length" :class="$style.users">
 			<div v-for="u in users" :key="u.id" :class="$style.user">
 				<MkAvatar :class="$style.avatar" :user="u"/>
 				<MkUserName :user="u" :nowrap="true"/>
@@ -55,9 +55,7 @@ function getReactionName(reaction: string): string {
 
 .reaction {
 	max-width: 100px;
-	padding-right: 10px;
 	text-align: center;
-	border-right: solid 0.5px var(--divider);
 }
 
 .reactionIcon {
@@ -78,6 +76,8 @@ function getReactionName(reaction: string): string {
 	margin: -4px 14px 0 10px;
 	font-size: 0.95em;
 	text-align: left;
+	padding-left: 10px;
+	border-left: solid 0.5px var(--divider);
 }
 
 .user {
diff --git a/packages/frontend/src/components/MkReactionsViewer.reaction.vue b/packages/frontend/src/components/MkReactionsViewer.reaction.vue
index 99d70ec90407..6f4de81df716 100644
--- a/packages/frontend/src/components/MkReactionsViewer.reaction.vue
+++ b/packages/frontend/src/components/MkReactionsViewer.reaction.vue
@@ -168,12 +168,12 @@ onMounted(() => {
 
 if (!mock) {
 	useTooltip(buttonEl, async (showing) => {
-		const reactions = await misskeyApiGet('notes/reactions', {
+		const reactions = !defaultStore.state.hideReactionUsers ? await misskeyApiGet('notes/reactions', {
 			noteId: props.note.id,
 			type: props.reaction,
 			limit: 10,
 			_cacheKey_: props.count,
-		});
+		}) : [];
 
 		const users = reactions.map(x => x.user);
 
diff --git a/packages/frontend/src/pages/settings/general.vue b/packages/frontend/src/pages/settings/general.vue
index 04b02a7809f5..e748446d75ea 100644
--- a/packages/frontend/src/pages/settings/general.vue
+++ b/packages/frontend/src/pages/settings/general.vue
@@ -87,6 +87,11 @@ SPDX-License-Identifier: AGPL-3.0-only
 					<option value="others">{{ i18n.ts._hideReactionCount.others }}</option>
 					<option value="all">{{ i18n.ts._hideReactionCount.all }}</option>
 				</MkSelect>
+				<MkSwitch v-model="hideReactionUsers">
+					<template #caption>{{ i18n.ts.hideReactionUsersDescription }}</template>
+					{{ i18n.ts.hideReactionUsers }}
+					<span class="_beta">{{ i18n.ts.originalFeature }}</span>
+				</MkSwitch>
 			</div>
 
 			<MkSelect v-model="instanceTicker">
@@ -327,6 +332,7 @@ const showClipButtonInNoteFooter = computed(defaultStore.makeGetterSetter('showC
 const reactionsDisplaySize = computed(defaultStore.makeGetterSetter('reactionsDisplaySize'));
 const limitWidthOfReaction = computed(defaultStore.makeGetterSetter('limitWidthOfReaction'));
 const hideReactionCount = computed(defaultStore.makeGetterSetter('hideReactionCount'));
+const hideReactionUsers = computed(defaultStore.makeGetterSetter('hideReactionUsers'));
 const collapseRenotes = computed(defaultStore.makeGetterSetter('collapseRenotes'));
 const collapseRenotesTrigger = computed(defaultStore.makeGetterSetter('collapseRenotesTrigger'));
 const collapseSelfRenotes = computed(defaultStore.makeGetterSetter('collapseSelfRenotes'));
diff --git a/packages/frontend/src/store.ts b/packages/frontend/src/store.ts
index 0a79262f8bc7..6f46b5611226 100644
--- a/packages/frontend/src/store.ts
+++ b/packages/frontend/src/store.ts
@@ -428,6 +428,10 @@ export const defaultStore = markRaw(new Storage('base', {
 		where: 'account',
 		default: 'none' as 'none' | 'self' | 'others' | 'all',
 	},
+	hideReactionUsers: {
+		where: 'account',
+		default: false,
+	},
 	limitWidthOfReaction: {
 		where: 'device',
 		default: true,

From 3ca07490986ab5f1d3c96963c7be3bd704cf3def Mon Sep 17 00:00:00 2001
From: yukineko <27853966+hideki0403@users.noreply.github.com>
Date: Sun, 14 Apr 2024 14:53:05 +0900
Subject: [PATCH 7/8] =?UTF-8?q?docs:=20=E3=83=89=E3=82=AD=E3=83=A5?=
 =?UTF-8?q?=E3=83=A1=E3=83=B3=E3=83=88=E3=82=92=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG_KAKUREGA.md | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/CHANGELOG_KAKUREGA.md b/CHANGELOG_KAKUREGA.md
index 89a600ebdc90..0c9b225ba8e7 100644
--- a/CHANGELOG_KAKUREGA.md
+++ b/CHANGELOG_KAKUREGA.md
@@ -1,3 +1,28 @@
+## 1.35.0
+Release: 2024/04/14  
+Base: 2024.3.1  
+
+### 新機能
+- ノート内にある絵文字を絵文字ピッカーに追加できる機能を実装  
+  ![image](https://media.kakurega.app/static/misskey/cc9f3350-915a-4d96-bffd-df93054881ef.png)
+  - ノート内にある絵文字をクリック→「絵文字ピッカーに追加」で追加できます
+  - 既に絵文字ピッカーに追加されている場合は追加できません
+- リアクションした絵文字を絵文字ピッカーに追加できる機能を実装  
+  ![image](https://media.kakurega.app/static/misskey/f03f1852-2093-4cd3-91ea-37585b017a12.png)
+	- リアクション一覧から絵文字を右クリック (スマホの場合は長押し) →「絵文字ピッカーに追加」で追加できます
+	- 既に絵文字ピッカーに追加されている場合は追加できません
+- リアクション数の非表示機能を実装  
+  ![image](https://media.kakurega.app/static/misskey/f5c550a1-ed02-4baa-bcac-972fe1af910d.png)
+	- ノート下部のリアクション数と、詳細ページのリアクション数を非表示にできます
+- 誰がリアクションをしたのかを非表示にできる機能を実装  
+  ![image](https://media.kakurega.app/static/misskey/95edc174-826d-44da-8673-06968f8b60f0.png)
+	- リアクションをホバーした際のユーザー一覧と、詳細ページのリアクションタブにあるリアクションをしたユーザー一覧を非表示にできます
+  
+「リアクション数の非表示機能」「誰がリアクションをしたのかを非表示にできる機能」は、設定→全般から設定できます  
+
+### 変更
+- 時限ノートで1年以上先の日時を指定できないように変更
+
 ## 1.34.1
 Release: 2024/04/11  
 Base: 2024.3.1  

From 982e4bd8f679cecd61622e66610eca696d94d28e Mon Sep 17 00:00:00 2001
From: yukineko <27853966+hideki0403@users.noreply.github.com>
Date: Sun, 14 Apr 2024 14:59:01 +0900
Subject: [PATCH 8/8] release: v1.35.0

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

diff --git a/package.json b/package.json
index fa09ecde8c34..6dd72385b71b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "2024.3.1-kakurega.1.34.1",
+	"version": "2024.3.1-kakurega.1.35.0",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",