diff --git a/packages/frontend/src/components/MkNote.vue b/packages/frontend/src/components/MkNote.vue index 12bc3d5749..2c19667224 100644 --- a/packages/frontend/src/components/MkNote.vue +++ b/packages/frontend/src/components/MkNote.vue @@ -198,7 +198,7 @@ import { getNoteSummary } from '@/scripts/get-note-summary.js'; import { MenuItem } from '@/types/menu.js'; import MkRippleEffect from '@/components/MkRippleEffect.vue'; import { showMovedDialog } from '@/scripts/show-moved-dialog.js'; -import { shouldCollapsedLegacy, shouldCollapsed } from '@/scripts/collapsed.js'; +import { shouldCollapseLegacy, shouldCollapse } from '@/scripts/collapsed.js'; import { isEnabledUrlPreview } from '@/instance.js'; const props = withDefaults(defineProps<{ @@ -297,14 +297,14 @@ const collapseSize = ({ const isLong = ref(true); switch (collapsingNoteCondition) { case 'detailedCalculation': - isLong.value = shouldCollapsed(appearNote.value, collapseSize, parsed.value, urls.value ?? []); + isLong.value = shouldCollapse(appearNote.value, collapseSize, parsed.value, urls.value ?? []); break; case 'seeRenderedSize': break; // fail safe case 'legacyCalculation': default: - isLong.value = shouldCollapsedLegacy(appearNote.value, urls.value ?? []); + isLong.value = shouldCollapseLegacy(appearNote.value, urls.value ?? []); break; } const collapsed = ref(appearNote.value.cw == null && isLong.value); diff --git a/packages/frontend/src/scripts/collapsed.ts b/packages/frontend/src/scripts/collapsed.ts index 47d90465d4..6688a81153 100644 --- a/packages/frontend/src/scripts/collapsed.ts +++ b/packages/frontend/src/scripts/collapsed.ts @@ -7,7 +7,7 @@ import * as mfm from 'mfm-js'; import * as Misskey from 'misskey-js'; import { safeParseFloat } from './safe-parse.js'; -export function shouldCollapsedLegacy(note: Misskey.entities.Note, urls: string[]): boolean { +export function shouldCollapseLegacy(note: Misskey.entities.Note, urls: string[]): boolean { const collapsed = note.cw == null && ( note.text != null && ( (note.text.includes('$[x2')) || @@ -23,7 +23,7 @@ export function shouldCollapsedLegacy(note: Misskey.entities.Note, urls: string[ return collapsed; } -export function shouldCollapsed(note: Misskey.entities.Note, limitY: number, ast?: mfm.MfmNode[] | null, urls?: string[]): boolean { +export function shouldCollapse(note: Misskey.entities.Note, limitY: number, ast?: mfm.MfmNode[] | null, urls?: string[]): boolean { if (note.cw != null) return false; if (note.text == null) return false; if (note.files && note.files.length >= 5) return true;