usbharu
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

shouldCollapsed -> shouldCollapse

This commit is contained in:
FineArchs 2024-06-09 15:08:49 +09:00
parent 3aaa9dd842
commit af50d7353d
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/frontend/src/components/MkNote.vue
View File

@ -198,7 +198,7 @@ import { getNoteSummary } from '@/scripts/get-note-summary.js';
import { MenuItem } from '@/types/menu.js'; import { MenuItem } from '@/types/menu.js';
import MkRippleEffect from '@/components/MkRippleEffect.vue'; import MkRippleEffect from '@/components/MkRippleEffect.vue';
import { showMovedDialog } from '@/scripts/show-moved-dialog.js'; 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'; import { isEnabledUrlPreview } from '@/instance.js';
const props = withDefaults(defineProps<{ const props = withDefaults(defineProps<{
@ -297,14 +297,14 @@ const collapseSize = ({
const isLong = ref(true); const isLong = ref(true);
switch (collapsingNoteCondition) { switch (collapsingNoteCondition) {
case 'detailedCalculation': case 'detailedCalculation':
isLong.value = shouldCollapsed(appearNote.value, collapseSize, parsed.value, urls.value ?? []); isLong.value = shouldCollapse(appearNote.value, collapseSize, parsed.value, urls.value ?? []);
break; break;
case 'seeRenderedSize': case 'seeRenderedSize':
break; break;
// fail safe // fail safe
case 'legacyCalculation': case 'legacyCalculation':
default: default:
isLong.value = shouldCollapsedLegacy(appearNote.value, urls.value ?? []); isLong.value = shouldCollapseLegacy(appearNote.value, urls.value ?? []);
break; break;
} }
const collapsed = ref(appearNote.value.cw == null && isLong.value); const collapsed = ref(appearNote.value.cw == null && isLong.value);

4
packages/frontend/src/scripts/collapsed.ts
View File

@ -7,7 +7,7 @@ import * as mfm from 'mfm-js';
import * as Misskey from 'misskey-js'; import * as Misskey from 'misskey-js';
import { safeParseFloat } from './safe-parse.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 && ( const collapsed = note.cw == null && (
note.text != null && ( note.text != null && (
(note.text.includes('$[x2')) || (note.text.includes('$[x2')) ||
@ -23,7 +23,7 @@ export function shouldCollapsedLegacy(note: Misskey.entities.Note, urls: string[
return collapsed; 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.cw != null) return false;
if (note.text == null) return false; if (note.text == null) return false;
if (note.files && note.files.length >= 5) return true; if (note.files && note.files.length >= 5) return true;