From 764e516a3c1adf9d81197e67407167566f40e1be Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Sun, 15 Oct 2023 14:46:40 +0900
Subject: [PATCH] feat: add private visibility

---
 README.md                                     |  2 ++
 locales/en-US.yml                             |  2 ++
 locales/ja-JP.yml                             |  2 ++
 locales/zh-CN.yml                             |  2 ++
 locales/zh-TW.yml                             |  2 ++
 packages/client/src/components/MkPostForm.vue | 12 ++++++++--
 .../client/src/components/MkVisibility.vue    | 16 +++++++++++--
 .../src/components/MkVisibilityPicker.vue     | 23 ++++++++++++++++++-
 .../client/src/pages/settings/privacy.vue     |  8 +++++++
 9 files changed, 64 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 44d5af25..385c5428 100644
--- a/README.md
+++ b/README.md
@@ -19,6 +19,8 @@
 
 ## 主要な変更点
 
+- 「秘密」という公開範囲を追加
+  - 宛先無しのダイレクト投稿を言い換えているだけです
 - パフォーマンス向上のためアクティブユーザー以外のチャート生成を無効化
   - サードパーティー製クライアントが動かなくなるのを阻止するため API のエンドポイントは残していますが、叩いても `0` が並んだ配列しか返しません。
 - モデレーターでない一般ユーザーにもカスタム絵文字の管理権を与えられるように
diff --git a/locales/en-US.yml b/locales/en-US.yml
index 6292c969..4d05afb0 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -1710,6 +1710,8 @@ _visibility:
   followersDescription: "Make visible to your followers and mentioned users only"
   specified: "Direct"
   specifiedDescription: "Make visible for specified users only"
+  private: "Private"
+  privateDescription: "Make visible for you only"
   localOnly: "Local only"
   localOnlyDescription: "Not visible to remote users"
 _postForm:
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 3ccb28e9..3518224b 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -1494,6 +1494,8 @@ _visibility:
   followersDescription: "フォロワーと会話相手のみに公開"
   specified: "ダイレクト"
   specifiedDescription: "指定したユーザーのみに公開"
+  private: "秘密"
+  privateDescription: "あなた以外には非公開"
   localOnly: "ローカルのみ"
   localOnlyDescription: "リモートユーザーには非公開"
 _postForm:
diff --git a/locales/zh-CN.yml b/locales/zh-CN.yml
index df820de3..27390cc5 100644
--- a/locales/zh-CN.yml
+++ b/locales/zh-CN.yml
@@ -1395,6 +1395,8 @@ _visibility:
   followersDescription: "仅对您的关注者和提及的用户可见"
   specified: "指定用户"
   specifiedDescription: "仅发送至指定用户"
+  private: "秘密"
+  privateDescription: "仅你可见"
   localOnly: "仅限本地"
   localOnlyDescription: "对远程用户不可见"
 _postForm:
diff --git a/locales/zh-TW.yml b/locales/zh-TW.yml
index f59b5237..3db41b35 100644
--- a/locales/zh-TW.yml
+++ b/locales/zh-TW.yml
@@ -1390,6 +1390,8 @@ _visibility:
   followersDescription: "僅發佈至關注者"
   specified: "指定使用者"
   specifiedDescription: "僅發送至指定使用者"
+  private: "祕密"
+  privateDescription: "僅你可見"
   localOnly: "僅限本地"
   localOnlyDescription: "對遠端使用者隱藏"
 _postForm:
diff --git a/packages/client/src/components/MkPostForm.vue b/packages/client/src/components/MkPostForm.vue
index f78728b5..2edfddf4 100644
--- a/packages/client/src/components/MkPostForm.vue
+++ b/packages/client/src/components/MkPostForm.vue
@@ -50,6 +50,9 @@
 					<span v-if="visibility === 'specified'"
 						><i class="ph-envelope-simple-open ph-bold ph-lg"></i
 					></span>
+					<span v-if="visibility === 'private'"
+						><i class="ph-eye-slash ph-bold ph-lg"></i
+					></span>
 				</button>
 				<button
 					v-tooltip="i18n.ts.previewNoteText"
@@ -527,6 +530,8 @@ if (
 			}).then((users) => {
 				users.forEach(pushVisibleUser);
 			});
+		} else {
+			visibility.value = "private";
 		}
 
 		if (props.reply.userId !== $i.id) {
@@ -885,9 +890,12 @@ async function post() {
 		poll: poll.value,
 		cw: useCw.value ? cw.value || "" : undefined,
 		localOnly: localOnly.value,
-		visibility: visibility.value,
+		visibility:
+			visibility.value === "private" ? "specified" : visibility.value,
 		visibleUserIds:
-			visibility.value === "specified"
+			visibility.value === "private"
+				? []
+				: visibility.value === "specified"
 				? visibleUsers.value.map((u) => u.id)
 				: undefined,
 	};
diff --git a/packages/client/src/components/MkVisibility.vue b/packages/client/src/components/MkVisibility.vue
index 5ac17f7e..de7092d4 100644
--- a/packages/client/src/components/MkVisibility.vue
+++ b/packages/client/src/components/MkVisibility.vue
@@ -11,10 +11,19 @@
 			class="ph-lock ph-bold ph-lg"
 		></i>
 		<i
-			v-else-if="note.visibility === 'specified'"
+			v-else-if="
+				note.visibility === 'specified' &&
+				note.visibleUserIds.length > 0
+			"
 			ref="specified"
 			class="ph-envelope-simple-open ph-bold ph-lg"
 		></i>
+		<i
+			v-else-if="note.visibility === 'specified'"
+			v-tooltip="i18n.ts._visibility.private"
+			ref="specified"
+			class="ph-eye-slash ph-bold ph-lg"
+		></i>
 	</span>
 	<span v-if="note.localOnly" :class="$style.localOnly"
 		><i
@@ -42,7 +51,10 @@ const props = defineProps<{
 
 const specified = ref<HTMLElement>();
 
-if (props.note.visibility === "specified") {
+if (
+	props.note.visibility === "specified" &&
+	props.note.visibleUserIds.length > 0
+) {
 	useTooltip(specified, async (showing) => {
 		const users = await os.api("users/show", {
 			userIds: props.note.visibleUserIds,
diff --git a/packages/client/src/components/MkVisibilityPicker.vue b/packages/client/src/components/MkVisibilityPicker.vue
index 5d0330e8..bf96a3f1 100644
--- a/packages/client/src/components/MkVisibilityPicker.vue
+++ b/packages/client/src/components/MkVisibilityPicker.vue
@@ -84,6 +84,25 @@
 					}}</span>
 				</div>
 			</button>
+			<button
+				key="private"
+				class="_button"
+				:class="[$style.item, { [$style.active]: v === 'private' }]"
+				data-index="5"
+				@click="choose('private')"
+			>
+				<div :class="$style.icon">
+					<i class="ph-eye-slash ph-bold ph-lg"></i>
+				</div>
+				<div :class="$style.body">
+					<span :class="$style.itemTitle">{{
+						i18n.ts._visibility.private
+					}}</span>
+					<span :class="$style.itemDescription">{{
+						i18n.ts._visibility.privateDescription
+					}}</span>
+				</div>
+			</button>
 			<div :class="$style.divider"></div>
 			<button
 				key="localOnly"
@@ -154,7 +173,9 @@ watch(localOnly, () => {
 	emit("changeLocalOnly", localOnly.value);
 });
 
-function choose(visibility: (typeof firefish.noteVisibilities)[number]): void {
+function choose(
+	visibility: (typeof firefish.noteVisibilities)[number] | "private",
+): void {
 	v.value = visibility;
 	emit("changeVisibility", visibility);
 	nextTick(() => {
diff --git a/packages/client/src/pages/settings/privacy.vue b/packages/client/src/pages/settings/privacy.vue
index acadf4d5..e2fe8910 100644
--- a/packages/client/src/pages/settings/privacy.vue
+++ b/packages/client/src/pages/settings/privacy.vue
@@ -113,6 +113,11 @@
 					#suffix
 					>{{ i18n.ts._visibility.specified }}</template
 				>
+				<template
+					v-else-if="defaultNoteVisibility === 'private'"
+					#suffix
+					>{{ i18n.ts._visibility.private }}</template
+				>
 
 				<FormSelect v-model="defaultNoteVisibility" class="_formBlock">
 					<option value="public">
@@ -125,6 +130,9 @@
 					<option value="specified">
 						{{ i18n.ts._visibility.specified }}
 					</option>
+					<option value="private">
+						{{ i18n.ts._visibility.private }}
+					</option>
 				</FormSelect>
 				<FormSwitch v-model="defaultNoteLocalOnly" class="_formBlock">{{
 					i18n.ts._visibility.localOnly