diff options
| author | ozelot <contact@ozelot.dev> | 2023-11-03 17:52:31 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-03 17:52:31 +0900 |
| commit | c31d2e256318df04505e4cf22994001d2d4eaf0a (patch) | |
| tree | 15235816fd5e098745f03f4e649e3d69661e9451 /packages | |
| parent | enhance(frontend): federated instance icon with proxy (welcome entrance) (#12... (diff) | |
| download | sharkey-c31d2e256318df04505e4cf22994001d2d4eaf0a.tar.gz sharkey-c31d2e256318df04505e4cf22994001d2d4eaf0a.tar.bz2 sharkey-c31d2e256318df04505e4cf22994001d2d4eaf0a.zip | |
fix(frontend): サイレンス状態で公開範囲のパブリックを選択できてしまう問題を修正 (#12224) (#12225)
* fix(frontend): サイレンス状態で公開範囲のパブリックを選択できてしまう問題を修正 (#12224)
* docs: update changelog
---------
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/frontend/src/components/MkPostForm.vue | 5 | ||||
| -rw-r--r-- | packages/frontend/src/components/MkVisibilityPicker.vue | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/packages/frontend/src/components/MkPostForm.vue b/packages/frontend/src/components/MkPostForm.vue index 46faae9523..c0fd1c14d7 100644 --- a/packages/frontend/src/components/MkPostForm.vue +++ b/packages/frontend/src/components/MkPostForm.vue @@ -299,6 +299,10 @@ if (props.reply && props.reply.text != null) { } } +if ($i?.isSilenced && visibility === 'public') { + visibility = 'home'; +} + if (props.channel) { visibility = 'public'; localOnly = true; // TODO: チャンネルが連合するようになった折には消す @@ -448,6 +452,7 @@ function setVisibility() { os.popup(defineAsyncComponent(() => import('@/components/MkVisibilityPicker.vue')), { currentVisibility: visibility, + isSilenced: $i?.isSilenced, localOnly: localOnly, src: visibilityButton, }, { diff --git a/packages/frontend/src/components/MkVisibilityPicker.vue b/packages/frontend/src/components/MkVisibilityPicker.vue index 982a69925b..bbb3d3dbf5 100644 --- a/packages/frontend/src/components/MkVisibilityPicker.vue +++ b/packages/frontend/src/components/MkVisibilityPicker.vue @@ -9,7 +9,7 @@ SPDX-License-Identifier: AGPL-3.0-only <div :class="[$style.label, $style.item]"> {{ i18n.ts.visibility }} </div> - <button key="public" class="_button" :class="[$style.item, { [$style.active]: v === 'public' }]" data-index="1" @click="choose('public')"> + <button key="public" :disabled="isSilenced" class="_button" :class="[$style.item, { [$style.active]: v === 'public' }]" data-index="1" @click="choose('public')"> <div :class="$style.icon"><i class="ti ti-world"></i></div> <div :class="$style.body"> <span :class="$style.itemTitle">{{ i18n.ts._visibility.public }}</span> @@ -51,6 +51,7 @@ const modal = $shallowRef<InstanceType<typeof MkModal>>(); const props = withDefaults(defineProps<{ currentVisibility: typeof Misskey.noteVisibilities[number]; + isSilenced: boolean; localOnly: boolean; src?: HTMLElement; }>(), { |