mirrors/barkey
1
0
Fork 0
mirror of https://codeberg.org/yeentown/barkey.git synced 2025-07-06 03:56:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge: collapse renotes of notes created by the logged-in user - fix #1037 (!974)

Browse source 
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>
This commit is contained in:
Marie 2025-05-01 23:04:45 +00:00
commit f2f3ae0112
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
packages/frontend/src/components/MkNote.vue
View file

@ -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)
),
);

3
packages/frontend/src/components/SkNote.vue
View file

@ -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)
),
);