diff options
| author | Marie <github@yuugi.dev> | 2025-05-01 23:04:45 +0000 |
|---|---|---|
| committer | Marie <github@yuugi.dev> | 2025-05-01 23:04:45 +0000 |
| commit | f2f3ae0112d0528e7decf1fa538d69d0cddc6332 (patch) | |
| tree | b45f9c054d8ab484cb368f5e488f7d4303fd270d /packages/frontend/src/components | |
| parent | merge: allow clearing a role's color - fixes #734 (!976) (diff) | |
| parent | collapse renotes of my notes - fix #1037 (diff) | |
| download | sharkey-f2f3ae0112d0528e7decf1fa538d69d0cddc6332.tar.gz sharkey-f2f3ae0112d0528e7decf1fa538d69d0cddc6332.tar.bz2 sharkey-f2f3ae0112d0528e7decf1fa538d69d0cddc6332.zip | |
merge: collapse renotes of notes created by the logged-in user - fix #1037 (!974)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/974
Approved-by: Hazelnoot <acomputerdog@gmail.com>
Approved-by: Marie <github@yuugi.dev>
Diffstat (limited to 'packages/frontend/src/components')
| -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) ), ); |