Merge branch 'develop' into merge/2024-02-03

# Conflicts:
#	locales/index.d.ts
#	packages/backend/src/core/SearchService.ts
#	packages/frontend/src/pages/search.note.vue
#	packages/misskey-js/src/autogen/types.ts
#	sharkey-locales/en-US.yml
This commit is contained in:
Hazelnoot 2025-02-13 17:02:52 -05:00
commit 667262dcfb
8 changed files with 135 additions and 59 deletions

View file

@ -143,6 +143,7 @@ export class MiNote {
})
public fileIds: MiDriveFile['id'][];
@Index('IDX_NOTE_ATTACHED_FILE_TYPES', { synchronize: false })
@Column('varchar', {
length: 256, array: true, default: '{}',
})