mirrors/barkey
1
0
Fork 0
mirror of https://codeberg.org/yeentown/barkey.git synced 2025-08-21 02:23:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

(manually) revert bc422fe36f

Browse source 
the fix for #1037 was wrong (it would collapse a boosted quote if the
quoted note was from the current user), and not
necessary (`appearNote.value.userId` _is_ the author of the boosted
note, no need to look inside `note.renote` at all)

so… I'm not sure why I even raised the issue 😕
This commit is contained in:
dakkar 2025-05-03 08:39:49 +01:00
parent ae5b5e77cc
commit d41372f948
2 changed files with 2 additions and 4 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,8 +343,7 @@ 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 canRenote = computed(() => ['public', 'home'].includes(appearNote.value.visibility) || (appearNote.value.visibility === 'followers' && appearNote.value.userId === $i?.id));
const renoteCollapsed = ref( const renoteCollapsed = ref(
prefer.s.collapseRenotes && isRenote && ( prefer.s.collapseRenotes && isRenote && (
($i && ($i.id === note.value.userId || $i.id === appearNote.value.userId ($i && ($i.id === note.value.userId || $i.id === appearNote.value.userId)) || // `||` must be `||`! See https://github.com/misskey-dev/misskey/issues/13131
|| $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) (appearNote.value.myReaction != null)
), ),
); );

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

@ -343,8 +343,7 @@ 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 canRenote = computed(() => ['public', 'home'].includes(appearNote.value.visibility) || (appearNote.value.visibility === 'followers' && appearNote.value.userId === $i?.id));
const renoteCollapsed = ref( const renoteCollapsed = ref(
prefer.s.collapseRenotes && isRenote && ( prefer.s.collapseRenotes && isRenote && (
($i && ($i.id === note.value.userId || $i.id === appearNote.value.userId ($i && ($i.id === note.value.userId || $i.id === appearNote.value.userId)) || // `||` must be `||`! See https://github.com/misskey-dev/misskey/issues/13131
|| $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) (appearNote.value.myReaction != null)
), ),
); );