diff options
| author | zawa-ch <lunatic.zawa.ch@gmail.com> | 2023-12-18 20:59:20 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-18 20:59:20 +0900 |
| commit | 4e2d8029678951ca3b8b9b40e62901b0c67618ed (patch) | |
| tree | 3a2cc7ef92f461493945023969601bf7c9e63044 /packages/frontend/src/pages | |
| parent | Fix: Renoteの判定が間違っているのを修正 (#12706) (diff) | |
| download | misskey-4e2d8029678951ca3b8b9b40e62901b0c67618ed.tar.gz misskey-4e2d8029678951ca3b8b9b40e62901b0c67618ed.tar.bz2 misskey-4e2d8029678951ca3b8b9b40e62901b0c67618ed.zip | |
enhance: “つながりの公開範囲”がフォロー・フォロワー個別設定できるように (#12702)
* Enhance: “つながりの公開範囲”がフォロー・フォロワー個別設定できるように (#12072)
* refactor: crowdin 編集部分のコミットを打ち消し
https://github.com/misskey-dev/misskey/pull/12702#issuecomment-1859417158
* refactor: オブジェクトの名前修正
https://github.com/misskey-dev/misskey/pull/12702#issuecomment-1859417158
* fix: 設定項目の説明を削除
名称が具体的になって必要なくなったため
https://github.com/misskey-dev/misskey/pull/12702#discussion_r1429932463
Diffstat (limited to 'packages/frontend/src/pages')
| -rw-r--r-- | packages/frontend/src/pages/settings/privacy.vue | 18 | ||||
| -rw-r--r-- | packages/frontend/src/pages/user/home.vue | 6 |
2 files changed, 16 insertions, 8 deletions
diff --git a/packages/frontend/src/pages/settings/privacy.vue b/packages/frontend/src/pages/settings/privacy.vue index 971881ea24..67a2f2cb40 100644 --- a/packages/frontend/src/pages/settings/privacy.vue +++ b/packages/frontend/src/pages/settings/privacy.vue @@ -13,12 +13,18 @@ SPDX-License-Identifier: AGPL-3.0-only <template #caption>{{ i18n.ts.makeReactionsPublicDescription }}</template> </MkSwitch> - <MkSelect v-model="ffVisibility" @update:modelValue="save()"> - <template #label>{{ i18n.ts.ffVisibility }}</template> + <MkSelect v-model="followingVisibility" @update:modelValue="save()"> + <template #label>{{ i18n.ts.followingVisibility }}</template> + <option value="public">{{ i18n.ts._ffVisibility.public }}</option> + <option value="followers">{{ i18n.ts._ffVisibility.followers }}</option> + <option value="private">{{ i18n.ts._ffVisibility.private }}</option> + </MkSelect> + + <MkSelect v-model="followersVisibility" @update:modelValue="save()"> + <template #label>{{ i18n.ts.followersVisibility }}</template> <option value="public">{{ i18n.ts._ffVisibility.public }}</option> <option value="followers">{{ i18n.ts._ffVisibility.followers }}</option> <option value="private">{{ i18n.ts._ffVisibility.private }}</option> - <template #caption>{{ i18n.ts.ffVisibilityDescription }}</template> </MkSelect> <MkSwitch v-model="hideOnlineStatus" @update:modelValue="save()"> @@ -84,7 +90,8 @@ const preventAiLearning = ref($i.preventAiLearning); const isExplorable = ref($i.isExplorable); const hideOnlineStatus = ref($i.hideOnlineStatus); const publicReactions = ref($i.publicReactions); -const ffVisibility = ref($i.ffVisibility); +const followingVisibility = ref($i?.followingVisibility); +const followersVisibility = ref($i?.followersVisibility); const defaultNoteVisibility = computed(defaultStore.makeGetterSetter('defaultNoteVisibility')); const defaultNoteLocalOnly = computed(defaultStore.makeGetterSetter('defaultNoteLocalOnly')); @@ -100,7 +107,8 @@ function save() { isExplorable: !!isExplorable.value, hideOnlineStatus: !!hideOnlineStatus.value, publicReactions: !!publicReactions.value, - ffVisibility: ffVisibility.value, + followingVisibility: followingVisibility.value, + followersVisibility: followersVisibility.value, }); } diff --git a/packages/frontend/src/pages/user/home.vue b/packages/frontend/src/pages/user/home.vue index a87e03e761..a9497f4fe0 100644 --- a/packages/frontend/src/pages/user/home.vue +++ b/packages/frontend/src/pages/user/home.vue @@ -110,11 +110,11 @@ SPDX-License-Identifier: AGPL-3.0-only <b>{{ number(user.notesCount) }}</b> <span>{{ i18n.ts.notes }}</span> </MkA> - <MkA v-if="isFfVisibleForMe(user)" :to="userPage(user, 'following')"> + <MkA v-if="isFollowingVisibleForMe(user)" :to="userPage(user, 'following')"> <b>{{ number(user.followingCount) }}</b> <span>{{ i18n.ts.following }}</span> </MkA> - <MkA v-if="isFfVisibleForMe(user)" :to="userPage(user, 'followers')"> + <MkA v-if="isFollowersVisibleForMe(user)" :to="userPage(user, 'followers')"> <b>{{ number(user.followersCount) }}</b> <span>{{ i18n.ts.followers }}</span> </MkA> @@ -173,7 +173,7 @@ import { dateString } from '@/filters/date.js'; import { confetti } from '@/scripts/confetti.js'; import MkNotes from '@/components/MkNotes.vue'; import { api } from '@/os.js'; -import { isFfVisibleForMe } from '@/scripts/isFfVisibleForMe.js'; +import { isFollowingVisibleForMe, isFollowersVisibleForMe } from '@/scripts/isFfVisibleForMe.js'; function calcAge(birthdate: string): number { const date = new Date(birthdate); |