diff options
| -rw-r--r-- | packages/frontend/src/components/MkNote.vue | 3 | ||||
| -rw-r--r-- | packages/frontend/src/components/SkNote.vue | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/packages/frontend/src/components/MkNote.vue b/packages/frontend/src/components/MkNote.vue index 55efc3c193..b90b285db5 100644 --- a/packages/frontend/src/components/MkNote.vue +++ b/packages/frontend/src/components/MkNote.vue @@ -343,7 +343,8 @@ const showTicker = (prefer.s.instanceTicker === 'always') || (prefer.s.instanceT const canRenote = computed(() => ['public', 'home'].includes(appearNote.value.visibility) || (appearNote.value.visibility === 'followers' && appearNote.value.userId === $i?.id)); const renoteCollapsed = ref( prefer.s.collapseRenotes && isRenote && ( - ($i && ($i.id === note.value.userId || $i.id === appearNote.value.userId)) || // `||` must be `||`! See https://github.com/misskey-dev/misskey/issues/13131 + ($i && ($i.id === note.value.userId || $i.id === appearNote.value.userId + || $i.id === note.value.renote?.userId || $i.id === appearNote.value.renote.userId )) || // `||` must be `||`! See https://github.com/misskey-dev/misskey/issues/13131 (appearNote.value.myReaction != null) ), ); diff --git a/packages/frontend/src/components/SkNote.vue b/packages/frontend/src/components/SkNote.vue index 98609cfac5..8e69a6b769 100644 --- a/packages/frontend/src/components/SkNote.vue +++ b/packages/frontend/src/components/SkNote.vue @@ -343,7 +343,8 @@ const showTicker = (prefer.s.instanceTicker === 'always') || (prefer.s.instanceT const canRenote = computed(() => ['public', 'home'].includes(appearNote.value.visibility) || (appearNote.value.visibility === 'followers' && appearNote.value.userId === $i?.id)); const renoteCollapsed = ref( prefer.s.collapseRenotes && isRenote && ( - ($i && ($i.id === note.value.userId || $i.id === appearNote.value.userId)) || // `||` must be `||`! See https://github.com/misskey-dev/misskey/issues/13131 + ($i && ($i.id === note.value.userId || $i.id === appearNote.value.userId + || $i.id === note.value.renote?.userId || $i.id === appearNote.value.renote.userId )) || // `||` must be `||`! See https://github.com/misskey-dev/misskey/issues/13131 (appearNote.value.myReaction != null) ), ); |