diff options
| author | 1STEP621 <86859447+1STEP621@users.noreply.github.com> | 2023-12-18 19:49:19 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-18 19:49:19 +0900 |
| commit | f6ff3b1f1a7047a29337575c08849be99ac15a4b (patch) | |
| tree | cedbc8c26140dadb334c6970fa4b4a7a36105291 /packages/frontend/src/components | |
| parent | Enhance(frontend): Shift+Tabで前の補完候補が選択できるように ... (diff) | |
| download | misskey-f6ff3b1f1a7047a29337575c08849be99ac15a4b.tar.gz misskey-f6ff3b1f1a7047a29337575c08849be99ac15a4b.tar.bz2 misskey-f6ff3b1f1a7047a29337575c08849be99ac15a4b.zip | |
Fix: Renoteの判定が間違っているのを修正 (#12706)
* RNと引用RNの判定が間違っているのを修正
* remove dump.rdb
* update CHANGELOG.md
* lint fix
Diffstat (limited to 'packages/frontend/src/components')
| -rw-r--r-- | packages/frontend/src/components/MkCwButton.vue | 2 | ||||
| -rw-r--r-- | packages/frontend/src/components/MkNote.vue | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/packages/frontend/src/components/MkCwButton.vue b/packages/frontend/src/components/MkCwButton.vue index 70b7bc8295..a25193a57c 100644 --- a/packages/frontend/src/components/MkCwButton.vue +++ b/packages/frontend/src/components/MkCwButton.vue @@ -17,6 +17,7 @@ import MkButton from '@/components/MkButton.vue'; const props = defineProps<{ modelValue: boolean; text: string | null; + renote: Misskey.entities.Note | null; files: Misskey.entities.DriveFile[]; poll?: { expiresAt: string | null; @@ -41,6 +42,7 @@ const emit = defineEmits<{ const label = computed(() => { return concat([ props.text ? [i18n.t('_cw.chars', { count: props.text.length })] : [], + props.renote != null ? [i18n.ts.quote] : [], props.files.length !== 0 ? [i18n.t('_cw.files', { count: props.files.length })] : [], props.poll != null ? [i18n.ts.poll] : [], ] as string[][]).join(' / '); diff --git a/packages/frontend/src/components/MkNote.vue b/packages/frontend/src/components/MkNote.vue index e723198a17..609b381598 100644 --- a/packages/frontend/src/components/MkNote.vue +++ b/packages/frontend/src/components/MkNote.vue @@ -54,7 +54,7 @@ SPDX-License-Identifier: AGPL-3.0-only <div style="container-type: inline-size;"> <p v-if="appearNote.cw != null" :class="$style.cw"> <Mfm v-if="appearNote.cw != ''" style="margin-right: 8px;" :text="appearNote.cw" :author="appearNote.user" :nyaize="'respect'"/> - <MkCwButton v-model="showContent" :text="appearNote.text" :files="appearNote.files" :poll="appearNote.poll" style="margin: 4px 0;"/> + <MkCwButton v-model="showContent" :text="appearNote.text" :renote="appearNote" :files="appearNote.files" :poll="appearNote.poll" style="margin: 4px 0;"/> </p> <div v-show="appearNote.cw == null || showContent" :class="[{ [$style.contentCollapsed]: collapsed }]"> <div :class="$style.text"> @@ -229,6 +229,7 @@ if (noteViewInterruptors.length > 0) { const isRenote = ( note.value.renote != null && note.value.text == null && + note.value.cw == null && note.value.fileIds.length === 0 && note.value.poll == null ); |