tweak 25c00e61

CHANGELOG_CHERRYPICK.md

@@ -30,6 +30,7 @@ Misskey의 전체 변경 사항을 확인하려면, [CHANGELOG.md#2023xx](CHANGE
 
 ### Client
 - Feat: 노트 편집 시 토스트 알림을 표시하고 사운드를 재생
+- Feat: PostForm 접두사에 현재 공개 범위 표시 ([tanukey-dev/tanukey@1cc0071](https://github.com/tanukey-dev/tanukey/commit/1cc0071bbd424949d9305bcec554f5d755a73554))
 - Enhance: 노트를 편집할 때 편집 중인 노트임을 강조함
 - Enhance: 타임라인에서 새 노트가 20개 이상이면 '20+'로 표기
 - Enhance: 노트를 편집한 시간이 개별적으로 표시됨

packages/frontend/src/components/MkPostForm.vue

@@ -102,7 +102,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 </template>
 
 <script lang="ts" setup>
-import { inject, watch, nextTick, computed, onMounted, defineAsyncComponent, WritableComputedRef } from 'vue';
+import { inject, watch, nextTick, onMounted, defineAsyncComponent } from 'vue';
 import * as mfm from 'cherrypick-mfm-js';
 import * as Misskey from 'cherrypick-js';
 import insertTextAtCursor from 'insert-text-at-cursor';
@@ -202,17 +202,6 @@ let recentHashtags = $ref(JSON.parse(miLocalStorage.getItem('hashtags') ?? '[]')
 let imeText = $ref('');
 let showingOptions = $ref(false);
 let disableRightClick = $ref(false);
-let postChannel: WritableComputedRef<misskey.entities.Channel> = computed(defaultStore.makeGetterSetter('postChannel'));
-
-watch(postChannel, () => {
-  if (postChannel.value) {
-    if (!postChannel.value.federation) {
-      localOnly = true;
-    }
-  } else {
-    localOnly = false;
-  }
-});
 
 const draftKey = $computed((): string => {
 	let key = props.channel ? `channel:${props.channel.id}` : '';
@@ -230,11 +219,7 @@ const draftKey = $computed((): string => {
 
 const placeholder = $computed((): string => {
 	let postTo = '';
-	if (postChannel.value) {
-		postTo = '[' + postChannel.value.name + '] ';
-	} else {
 	postTo = '[' + i18n.ts._visibility[visibility] + '] ';
-	}
 
 	if (props.renote) {
 		return postTo + i18n.ts._postForm.quotePlaceholder;

packages/frontend/src/components/MkPostFormSimple.vue

@@ -241,14 +241,17 @@ const draftKey = $computed((): string => {
 });
 
 const placeholder = $computed((): string => {
+	let postTo = '';
+	postTo = '[' + i18n.ts._visibility[visibility] + '] ';
+
 	if (!$i) {
 		return i18n.ts._postForm.signinRequiredPlaceholder;
 	} else if (props.renote) {
-		return i18n.ts._postForm.quotePlaceholder;
+		return postTo + i18n.ts._postForm.quotePlaceholder;
 	} else if (props.reply) {
-		return i18n.ts._postForm.replyPlaceholder;
+		return postTo + i18n.ts._postForm.replyPlaceholder;
 	} else if (props.channel) {
-		return i18n.ts._postForm.channelPlaceholder;
+		return postTo + i18n.ts._postForm.channelPlaceholder;
 	} else {
 		const xs = [
 			i18n.ts._postForm._placeholders.a,
@@ -258,7 +261,7 @@ const placeholder = $computed((): string => {
 			i18n.ts._postForm._placeholders.e,
 			i18n.ts._postForm._placeholders.f,
 		];
-		return xs[Math.floor(Math.random() * xs.length)];
+		return postTo + xs[Math.floor(Math.random() * xs.length)];
 	}
 });