Merge remote-tracking branch 'refs/remotes/misskey-original/develop' into develop

# Conflicts:
#	README.md
#	packages/backend/src/core/entities/AbuseUserReportEntityService.ts
#	packages/frontend/src/pages/admin/moderation.vue
This commit is contained in:
mattyatea 2024-05-31 21:18:45 +09:00
commit e86e8f6aa6
49 changed files with 466 additions and 178 deletions

View file

@ -6,15 +6,16 @@
import * as Misskey from 'misskey-js';
export function shouldCollapsed(note: Misskey.entities.Note, urls: string[]): boolean {
const collapsed = note.cw == null && note.text != null && (
(note.text.includes('$[x2')) ||
(note.text.includes('$[x3')) ||
(note.text.includes('$[x4')) ||
(note.text.includes('$[scale')) ||
(note.text.split('\n').length > 9) ||
(note.text.length > 500) ||
(note.files.length >= 5) ||
(urls.length >= 4)
const collapsed = note.cw == null && (
note.text != null && (
(note.text.includes('$[x2')) ||
(note.text.includes('$[x3')) ||
(note.text.includes('$[x4')) ||
(note.text.includes('$[scale')) ||
(note.text.split('\n').length > 9) ||
(note.text.length > 500) ||
(urls.length >= 4)
) || note.files.length >= 5
);
return collapsed;