From 51ec1914f957060b36829b0fe59a7cafd01bea0b Mon Sep 17 00:00:00 2001 From: FineArchs Date: Tue, 22 Apr 2025 18:09:33 +0900 Subject: [PATCH] revert "shouldCollapsed -> shouldCollapse" --- packages/frontend-embed/src/components/EmNote.vue | 4 ++-- packages/frontend-embed/src/components/EmNoteDetailed.vue | 4 ++-- packages/frontend-embed/src/components/EmSubNoteContent.vue | 4 ++-- packages/frontend-shared/js/collapsed.ts | 4 ++-- packages/frontend/src/components/MkNote.vue | 6 +++--- packages/frontend/src/components/MkSubNoteContent.vue | 6 +++--- packages/frontend/src/pages/welcome.timeline.note.vue | 6 +++--- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/packages/frontend-embed/src/components/EmNote.vue b/packages/frontend-embed/src/components/EmNote.vue index 0eede5fb0c..ab29f91e83 100644 --- a/packages/frontend-embed/src/components/EmNote.vue +++ b/packages/frontend-embed/src/components/EmNote.vue @@ -125,7 +125,7 @@ import EmUserName from '@/components/EmUserName.vue'; import EmTime from '@/components/EmTime.vue'; import { userPage } from '@/utils.js'; import { i18n } from '@/i18n.js'; -import { shouldCollapse } from '@@/js/collapsed.js'; +import { shouldCollapsed } from '@@/js/collapsed.js'; function getAppearNote(note: Misskey.entities.Note) { return Misskey.note.isPureRenote(note) ? note.renote : note; @@ -153,7 +153,7 @@ const renoteTime = shallowRef(); const appearNote = computed(() => getAppearNote(note.value)); const showContent = ref(false); const parsed = computed(() => appearNote.value.text ? mfm.parse(appearNote.value.text) : null); -const isLong = shouldCollapse(appearNote.value, 13.5, parsed.value); +const isLong = shouldCollapsed(appearNote.value, 13.5, parsed.value); const collapsed = ref(appearNote.value.cw == null && isLong); const isDeleted = ref(false); diff --git a/packages/frontend-embed/src/components/EmNoteDetailed.vue b/packages/frontend-embed/src/components/EmNoteDetailed.vue index bcbb1ba241..dcb5a1f056 100644 --- a/packages/frontend-embed/src/components/EmNoteDetailed.vue +++ b/packages/frontend-embed/src/components/EmNoteDetailed.vue @@ -145,7 +145,7 @@ import { userPage } from '@/utils.js'; import { notePage } from '@/utils.js'; import { i18n } from '@/i18n.js'; import { DI } from '@/di.js'; -import { shouldCollapse } from '@@/js/collapsed.js'; +import { shouldCollapsed } from '@@/js/collapsed.js'; import { url } from '@@/js/config.js'; import EmMfm from '@/components/EmMfm.js'; @@ -172,7 +172,7 @@ const appearNote = computed(() => isRenote ? note.value.renote as Misskey.entiti const showContent = ref(false); const isDeleted = ref(false); const parsed = appearNote.value.text ? mfm.parse(appearNote.value.text) : null; -const isLong = shouldCollapse(appearNote.value, 13.5, parsed.value); +const isLong = shouldCollapsed(appearNote.value, 13.5, parsed.value); const collapsed = ref(appearNote.value.cw == null && isLong); diff --git a/packages/frontend-embed/src/components/EmSubNoteContent.vue b/packages/frontend-embed/src/components/EmSubNoteContent.vue index ed2fa3d8ea..addde74bce 100644 --- a/packages/frontend-embed/src/components/EmSubNoteContent.vue +++ b/packages/frontend-embed/src/components/EmSubNoteContent.vue @@ -36,7 +36,7 @@ import EmMediaList from '@/components/EmMediaList.vue'; import EmPoll from '@/components/EmPoll.vue'; import { i18n } from '@/i18n.js'; import { url } from '@@/js/config.js'; -import { shouldCollapse } from '@@/js/collapsed.js'; +import { shouldCollapsed } from '@@/js/collapsed.js'; import EmA from '@/components/EmA.vue'; import EmMfm from '@/components/EmMfm.js'; @@ -44,7 +44,7 @@ const props = defineProps<{ note: Misskey.entities.Note; }>(); -const isLong = shouldCollapse(props.note, 13.5); +const isLong = shouldCollapsed(props.note, 13.5); const collapsed = ref(isLong); diff --git a/packages/frontend-shared/js/collapsed.ts b/packages/frontend-shared/js/collapsed.ts index d742c85434..73e0878d4e 100644 --- a/packages/frontend-shared/js/collapsed.ts +++ b/packages/frontend-shared/js/collapsed.ts @@ -13,7 +13,7 @@ function safeParseFloat(str: unknown): number | null { return num; } -export function shouldCollapseLegacy(note: Misskey.entities.Note, urls: string[]): boolean { +export function shouldCollapsedLegacy(note: Misskey.entities.Note, urls: string[]): boolean { const collapsed = note.cw == null && ( (note.text != null && ( (note.text.includes('$[x2')) || @@ -29,7 +29,7 @@ export function shouldCollapseLegacy(note: Misskey.entities.Note, urls: string[] return collapsed; } -export function shouldCollapse(note: Misskey.entities.Note, limitY: number, ast?: mfm.MfmNode[] | null, urls?: string[]): boolean { +export function shouldCollapsed(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; diff --git a/packages/frontend/src/components/MkNote.vue b/packages/frontend/src/components/MkNote.vue index 609675224b..bfad09b776 100644 --- a/packages/frontend/src/components/MkNote.vue +++ b/packages/frontend/src/components/MkNote.vue @@ -218,7 +218,7 @@ import { claimAchievement } from '@/utility/achievements.js'; import { getNoteSummary } from '@/utility/get-note-summary.js'; import MkRippleEffect from '@/components/MkRippleEffect.vue'; import { showMovedDialog } from '@/utility/show-moved-dialog.js'; -import { shouldCollapseLegacy, shouldCollapse } from '@@/js/collapsed.js'; +import { shouldCollapsedLegacy, shouldCollapsed } from '@@/js/collapsed.js'; import { isEnabledUrlPreview } from '@/instance.js'; import { focusPrev, focusNext } from '@/utility/focus.js'; import { getAppearNote } from '@/utility/get-appear-note.js'; @@ -315,14 +315,14 @@ const collapseSize = defaultStore.state.collapsingNoteSize; const isLong = ref(true); switch (collapsingNoteCondition) { case 'detailedCalculation': - isLong.value = shouldCollapse(appearNote.value, collapseSize, parsed.value, urls.value ?? []); + isLong.value = shouldCollapsed(appearNote.value, collapseSize, parsed.value, urls.value ?? []); break; case 'seeRenderedSize': break; // fail safe case 'legacyCalculation': default: - isLong.value = shouldCollapseLegacy(appearNote.value, urls.value ?? []); + isLong.value = shouldCollapsedLegacy(appearNote.value, urls.value ?? []); break; } const collapsed = ref(appearNote.value.cw == null && isLong.value); diff --git a/packages/frontend/src/components/MkSubNoteContent.vue b/packages/frontend/src/components/MkSubNoteContent.vue index e0fe3afdf7..79b3d26a46 100644 --- a/packages/frontend/src/components/MkSubNoteContent.vue +++ b/packages/frontend/src/components/MkSubNoteContent.vue @@ -35,7 +35,7 @@ SPDX-License-Identifier: AGPL-3.0-only import { ref, computed, onMounted } from 'vue'; import * as Misskey from 'misskey-js'; import * as mfm from 'mfm-js'; -import { shouldCollapseLegacy, shouldCollapse } from '@@/js/collapsed.js'; +import { shouldCollapsedLegacy, shouldCollapsed } from '@@/js/collapsed.js'; import MkMediaList from '@/components/MkMediaList.vue'; import MkPoll from '@/components/MkPoll.vue'; import { i18n } from '@/i18n.js'; @@ -63,7 +63,7 @@ const isLong = ref(true); switch (collapsingNoteCondition) { case 'detailedCalculation': // eslint-disable-next-line vue/no-setup-props-destructure - isLong.value = shouldCollapse(props.note, collapseSize, ast.value); + isLong.value = shouldCollapsed(props.note, collapseSize, ast.value); break; case 'seeRenderedSize': break; @@ -71,7 +71,7 @@ switch (collapsingNoteCondition) { case 'legacyCalculation': default: // eslint-disable-next-line vue/no-setup-props-destructure - isLong.value = shouldCollapseLegacy(props.note, []); + isLong.value = shouldCollapsedLegacy(props.note, []); break; } const collapsed = ref(isLong.value); diff --git a/packages/frontend/src/pages/welcome.timeline.note.vue b/packages/frontend/src/pages/welcome.timeline.note.vue index 680fe08c14..6fb0219734 100644 --- a/packages/frontend/src/pages/welcome.timeline.note.vue +++ b/packages/frontend/src/pages/welcome.timeline.note.vue @@ -15,7 +15,7 @@ SPDX-License-Identifier: AGPL-3.0-only RN: ... -
+
RN: ... @@ -46,14 +46,14 @@ defineProps<{ }>(); const noteTextEl = useTemplateRef('noteTextEl'); -const shouldCollapse = ref(false); +const shouldCollapsed = ref(false); const showContent = ref(false); function calcCollapse() { if (noteTextEl.value) { const height = noteTextEl.value.scrollHeight; if (height > 200) { - shouldCollapse.value = true; + shouldCollapsed.value = true; } } }