Merge branch 'develop' into upstream/2025.5.0

This commit is contained in:
dakkar 2025-06-13 08:43:17 +01:00
commit 33aee38a59
125 changed files with 3926 additions and 2148 deletions

View file

@ -11,12 +11,12 @@ import { inspect } from 'node:util';
import WebSocket, { ClientOptions } from 'ws';
import fetch, { File, RequestInit, type Headers } from 'node-fetch';
import { DataSource } from 'typeorm';
import { load as cheerio } from 'cheerio';
import { load as cheerio } from 'cheerio/slim';
import { type Response } from 'node-fetch';
import Fastify from 'fastify';
import { entities } from '../src/postgres.js';
import { loadConfig } from '../src/config.js';
import type { CheerioAPI } from 'cheerio';
import type { CheerioAPI } from 'cheerio/slim';
import type * as misskey from 'misskey-js';
import { DEFAULT_POLICIES } from '@/core/RoleService.js';
import { validateContentTypeSetAsActivityPub } from '@/core/activitypub/misc/validator.js';