usbharu
/
misskey
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/channel_muting

This commit is contained in:
おさむのひと 2025-10-28 14:29:31 +09:00 committed by GitHub
parent a4e640d700 6571c87e14
commit e8dd5b6b2c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
15 changed files with 358 additions and 1004 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -68,7 +68,7 @@
"devDependencies": { "devDependencies": {
"@misskey-dev/eslint-plugin": "2.1.0", "@misskey-dev/eslint-plugin": "2.1.0",
"@types/js-yaml": "4.0.9", "@types/js-yaml": "4.0.9",
"@types/node": "22.18.10", "@types/node": "24.9.1",
"@typescript-eslint/eslint-plugin": "8.46.1", "@typescript-eslint/eslint-plugin": "8.46.1",
"@typescript-eslint/parser": "8.46.1", "@typescript-eslint/parser": "8.46.1",
"cross-env": "10.1.0", "cross-env": "10.1.0",

8
packages/backend/package.json
View File

@ -87,7 +87,7 @@
"@nestjs/core": "11.1.6", "@nestjs/core": "11.1.6",
"@nestjs/testing": "11.1.6", "@nestjs/testing": "11.1.6",
"@peertube/http-signature": "1.7.0", "@peertube/http-signature": "1.7.0",
"@sentry/node": "8.55.0", "@sentry/node": "10.20.0",
"@sentry/profiling-node": "10.20.0", "@sentry/profiling-node": "10.20.0",
"@simplewebauthn/server": "12.0.0", "@simplewebauthn/server": "12.0.0",
"@sinonjs/fake-timers": "11.3.1", "@sinonjs/fake-timers": "11.3.1",
@ -117,7 +117,7 @@
"fastify": "5.6.1", "fastify": "5.6.1",
"fastify-raw-body": "5.0.0", "fastify-raw-body": "5.0.0",
"feed": "4.2.2", "feed": "4.2.2",
"file-type": "19.6.0", "file-type": "21.0.0",
"fluent-ffmpeg": "2.1.3", "fluent-ffmpeg": "2.1.3",
"form-data": "4.0.4", "form-data": "4.0.4",
"got": "14.5.0", "got": "14.5.0",
@ -191,7 +191,7 @@
"devDependencies": { "devDependencies": {
"@jest/globals": "29.7.0", "@jest/globals": "29.7.0",
"@nestjs/platform-express": "10.4.20", "@nestjs/platform-express": "10.4.20",
"@sentry/vue": "9.46.0", "@sentry/vue": "10.20.0",
"@simplewebauthn/types": "12.0.0", "@simplewebauthn/types": "12.0.0",
"@swc/jest": "0.2.39", "@swc/jest": "0.2.39",
"@types/accepts": "1.3.7", "@types/accepts": "1.3.7",
@ -210,7 +210,7 @@
"@types/jsrsasign": "10.5.15", "@types/jsrsasign": "10.5.15",
"@types/mime-types": "2.1.4", "@types/mime-types": "2.1.4",
"@types/ms": "0.7.34", "@types/ms": "0.7.34",
"@types/node": "22.18.10", "@types/node": "24.9.1",
"@types/nodemailer": "6.4.20", "@types/nodemailer": "6.4.20",
"@types/oauth": "0.9.6", "@types/oauth": "0.9.6",
"@types/oauth2orize": "1.11.5", "@types/oauth2orize": "1.11.5",

4
packages/backend/src/core/FileInfoService.ts
View File

@ -20,8 +20,8 @@ import { AiService } from '@/core/AiService.js';
import { LoggerService } from '@/core/LoggerService.js'; import { LoggerService } from '@/core/LoggerService.js';
import type Logger from '@/logger.js'; import type Logger from '@/logger.js';
import { bindThis } from '@/decorators.js'; import { bindThis } from '@/decorators.js';
import type { PredictionType } from 'nsfwjs';
import { isMimeImage } from '@/misc/is-mime-image.js'; import { isMimeImage } from '@/misc/is-mime-image.js';
import type { PredictionType } from 'nsfwjs';
export type FileInfo = { export type FileInfo = {
size: number; size: number;
@ -339,7 +339,7 @@ export class FileInfoService {
} }
@bindThis @bindThis
public fixMime(mime: string | fileType.MimeType): string { public fixMime(mime: string): string {
// see https://github.com/misskey-dev/misskey/pull/10686 // see https://github.com/misskey-dev/misskey/pull/10686
if (mime === 'audio/x-flac') { if (mime === 'audio/x-flac') {
return 'audio/flac'; return 'audio/flac';

2
packages/frontend-builder/package.json
View File

@ -11,7 +11,7 @@
}, },
"devDependencies": { "devDependencies": {
"@types/estree": "1.0.8", "@types/estree": "1.0.8",
"@types/node": "22.18.10", "@types/node": "24.9.1",
"@typescript-eslint/eslint-plugin": "8.46.1", "@typescript-eslint/eslint-plugin": "8.46.1",
"@typescript-eslint/parser": "8.46.1", "@typescript-eslint/parser": "8.46.1",
"rollup": "4.52.4", "rollup": "4.52.4",

2
packages/frontend-embed/package.json
View File

@ -43,7 +43,7 @@
"@testing-library/vue": "8.1.0", "@testing-library/vue": "8.1.0",
"@types/estree": "1.0.8", "@types/estree": "1.0.8",
"@types/micromatch": "4.0.9", "@types/micromatch": "4.0.9",
"@types/node": "22.18.10", "@types/node": "24.9.1",
"@types/punycode.js": "npm:@types/punycode@2.1.4", "@types/punycode.js": "npm:@types/punycode@2.1.4",
"@types/tinycolor2": "1.4.6", "@types/tinycolor2": "1.4.6",
"@types/ws": "8.18.1", "@types/ws": "8.18.1",

2
packages/frontend-shared/package.json
View File

@ -21,7 +21,7 @@
"lint": "pnpm typecheck && pnpm eslint" "lint": "pnpm typecheck && pnpm eslint"
}, },
"devDependencies": { "devDependencies": {
"@types/node": "22.18.10", "@types/node": "24.9.1",
"@typescript-eslint/eslint-plugin": "8.46.1", "@typescript-eslint/eslint-plugin": "8.46.1",
"@typescript-eslint/parser": "8.46.1", "@typescript-eslint/parser": "8.46.1",
"esbuild": "0.25.10", "esbuild": "0.25.10",

4
packages/frontend/package.json
View File

@ -24,7 +24,7 @@
"@rollup/plugin-json": "6.1.0", "@rollup/plugin-json": "6.1.0",
"@rollup/plugin-replace": "6.0.2", "@rollup/plugin-replace": "6.0.2",
"@rollup/pluginutils": "5.3.0", "@rollup/pluginutils": "5.3.0",
"@sentry/vue": "10.19.0", "@sentry/vue": "10.20.0",
"@syuilo/aiscript": "1.1.2", "@syuilo/aiscript": "1.1.2",
"@syuilo/aiscript-0-19-0": "npm:@syuilo/aiscript@^0.19.0", "@syuilo/aiscript-0-19-0": "npm:@syuilo/aiscript@^0.19.0",
"@twemoji/parser": "16.0.0", "@twemoji/parser": "16.0.0",
@ -109,7 +109,7 @@
"@types/estree": "1.0.8", "@types/estree": "1.0.8",
"@types/matter-js": "0.20.2", "@types/matter-js": "0.20.2",
"@types/micromatch": "4.0.9", "@types/micromatch": "4.0.9",
"@types/node": "22.18.10", "@types/node": "24.9.1",
"@types/punycode.js": "npm:@types/punycode@2.1.4", "@types/punycode.js": "npm:@types/punycode@2.1.4",
"@types/sanitize-html": "2.16.0", "@types/sanitize-html": "2.16.0",
"@types/seedrandom": "3.0.8", "@types/seedrandom": "3.0.8",

2
packages/icons-subsetter/package.json
View File

@ -11,7 +11,7 @@
"lint": "pnpm typecheck && pnpm eslint" "lint": "pnpm typecheck && pnpm eslint"
}, },
"devDependencies": { "devDependencies": {
"@types/node": "22.18.10", "@types/node": "24.9.1",
"@types/wawoff2": "1.0.2", "@types/wawoff2": "1.0.2",
"@typescript-eslint/eslint-plugin": "8.46.1", "@typescript-eslint/eslint-plugin": "8.46.1",
"@typescript-eslint/parser": "8.46.1" "@typescript-eslint/parser": "8.46.1"

4
packages/misskey-bubble-game/package.json
View File

@ -6,10 +6,12 @@
"types": "./built/index.d.ts", "types": "./built/index.d.ts",
"exports": { "exports": {
".": { ".": {
"default": "./built/index.js",
"import": "./built/index.js", "import": "./built/index.js",
"types": "./built/index.d.ts" "types": "./built/index.d.ts"
}, },
"./*": { "./*": {
"default": "./built/*",
"import": "./built/*", "import": "./built/*",
"types": "./built/*" "types": "./built/*"
} }
@ -23,7 +25,7 @@
}, },
"devDependencies": { "devDependencies": {
"@types/matter-js": "0.20.2", "@types/matter-js": "0.20.2",
"@types/node": "22.18.10", "@types/node": "24.9.1",
"@types/seedrandom": "3.0.8", "@types/seedrandom": "3.0.8",
"@typescript-eslint/eslint-plugin": "8.46.1", "@typescript-eslint/eslint-plugin": "8.46.1",
"@typescript-eslint/parser": "8.46.1", "@typescript-eslint/parser": "8.46.1",

2
packages/misskey-js/generator/package.json
View File

@ -8,7 +8,7 @@
}, },
"devDependencies": { "devDependencies": {
"@readme/openapi-parser": "5.0.2", "@readme/openapi-parser": "5.0.2",
"@types/node": "22.18.10", "@types/node": "24.9.1",
"@typescript-eslint/eslint-plugin": "8.46.1", "@typescript-eslint/eslint-plugin": "8.46.1",
"@typescript-eslint/parser": "8.46.1", "@typescript-eslint/parser": "8.46.1",
"openapi-types": "12.1.3", "openapi-types": "12.1.3",

4
packages/misskey-js/package.json
View File

@ -8,10 +8,12 @@
"types": "./built/index.d.ts", "types": "./built/index.d.ts",
"exports": { "exports": {
".": { ".": {
"default": "./built/index.js",
"import": "./built/index.js", "import": "./built/index.js",
"types": "./built/index.d.ts" "types": "./built/index.d.ts"
}, },
"./*": { "./*": {
"default": "./built/*",
"import": "./built/*", "import": "./built/*",
"types": "./built/*" "types": "./built/*"
} }
@ -36,7 +38,7 @@
}, },
"devDependencies": { "devDependencies": {
"@microsoft/api-extractor": "7.53.1", "@microsoft/api-extractor": "7.53.1",
"@types/node": "22.18.10", "@types/node": "24.9.1",
"@typescript-eslint/eslint-plugin": "8.46.1", "@typescript-eslint/eslint-plugin": "8.46.1",
"@typescript-eslint/parser": "8.46.1", "@typescript-eslint/parser": "8.46.1",
"@vitest/coverage-v8": "3.2.4", "@vitest/coverage-v8": "3.2.4",

4
packages/misskey-reversi/package.json
View File

@ -6,10 +6,12 @@
"types": "./built/index.d.ts", "types": "./built/index.d.ts",
"exports": { "exports": {
".": { ".": {
"default": "./built/index.js",
"import": "./built/index.js", "import": "./built/index.js",
"types": "./built/index.d.ts" "types": "./built/index.d.ts"
}, },
"./*": { "./*": {
"default": "./built/*",
"import": "./built/*", "import": "./built/*",
"types": "./built/*" "types": "./built/*"
} }
@ -22,7 +24,7 @@
"lint": "pnpm typecheck && pnpm eslint" "lint": "pnpm typecheck && pnpm eslint"
}, },
"devDependencies": { "devDependencies": {
"@types/node": "22.18.10", "@types/node": "24.9.1",
"@typescript-eslint/eslint-plugin": "8.46.1", "@typescript-eslint/eslint-plugin": "8.46.1",
"@typescript-eslint/parser": "8.46.1", "@typescript-eslint/parser": "8.46.1",
"esbuild": "0.25.10", "esbuild": "0.25.10",

1281
pnpm-lock.yaml
View File

File diff suppressed because it is too large Load Diff

37
scripts/changelog-checker/package-lock.json generated
View File

@ -9,14 +9,14 @@
"version": "1.0.0", "version": "1.0.0",
"devDependencies": { "devDependencies": {
"@types/mdast": "4.0.4", "@types/mdast": "4.0.4",
"@types/node": "22.18.10", "@types/node": "24.9.1",
"@vitest/coverage-v8": "3.2.4", "@vitest/coverage-v8": "3.2.4",
"mdast-util-to-string": "4.0.0", "mdast-util-to-string": "4.0.0",
"remark": "15.0.1", "remark": "15.0.1",
"remark-parse": "11.0.0", "remark-parse": "11.0.0",
"typescript": "5.9.3", "typescript": "5.9.3",
"unified": "11.0.5", "unified": "11.0.5",
"vite": "6.3.6", "vite": "6.4.1",
"vite-node": "3.2.4", "vite-node": "3.2.4",
"vitest": "3.2.4" "vitest": "3.2.4"
} }
@ -940,14 +940,14 @@
"dev": true "dev": true
}, },
"node_modules/@types/node": { "node_modules/@types/node": {
"version": "22.18.10", "version": "24.9.1",
"resolved": "https://registry.npmjs.org/@types/node/-/node-22.18.10.tgz", "resolved": "https://registry.npmjs.org/@types/node/-/node-24.9.1.tgz",
"integrity": "sha512-anNG/V/Efn/YZY4pRzbACnKxNKoBng2VTFydVu8RRs5hQjikP8CQfaeAV59VFSCzKNp90mXiVXW2QzV56rwMrg==", "integrity": "sha512-QoiaXANRkSXK6p0Duvt56W208du4P9Uye9hWLWgGMDTEoKPhuenzNcC4vGUmrNkiOKTlIrBoyNQYNpSwfEZXSg==",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true, "peer": true,
"dependencies": { "dependencies": {
"undici-types": "~6.21.0" "undici-types": "~7.16.0"
} }
}, },
"node_modules/@types/unist": { "node_modules/@types/unist": {
@ -1171,9 +1171,9 @@
"license": "MIT" "license": "MIT"
}, },
"node_modules/brace-expansion": { "node_modules/brace-expansion": {
"version": "2.0.1", "version": "2.0.2",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
"integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
@ -1247,10 +1247,11 @@
"license": "MIT" "license": "MIT"
}, },
"node_modules/cross-spawn": { "node_modules/cross-spawn": {
"version": "7.0.3", "version": "7.0.6",
"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
"dev": true, "dev": true,
"license": "MIT",
"dependencies": { "dependencies": {
"path-key": "^3.1.0", "path-key": "^3.1.0",
"shebang-command": "^2.0.0", "shebang-command": "^2.0.0",
@ -2728,9 +2729,9 @@
} }
}, },
"node_modules/undici-types": { "node_modules/undici-types": {
"version": "6.21.0", "version": "7.16.0",
"resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz", "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.16.0.tgz",
"integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==", "integrity": "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==",
"dev": true, "dev": true,
"license": "MIT" "license": "MIT"
}, },
@ -2839,9 +2840,9 @@
} }
}, },
"node_modules/vite": { "node_modules/vite": {
"version": "6.3.6", "version": "6.4.1",
"resolved": "https://registry.npmjs.org/vite/-/vite-6.3.6.tgz", "resolved": "https://registry.npmjs.org/vite/-/vite-6.4.1.tgz",
"integrity": "sha512-0msEVHJEScQbhkbVTb/4iHZdJ6SXp/AvxL2sjwYQFfBqleHtnCqv1J3sa9zbWz/6kW1m9Tfzn92vW+kZ1WV6QA==", "integrity": "sha512-+Oxm7q9hDoLMyJOYfUYBuHQo+dkAloi33apOPP56pzj+vsdJDzr+j1NISE5pyaAuKL4A3UD34qd0lx5+kfKp2g==",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true, "peer": true,

4
scripts/changelog-checker/package.json
View File

@ -10,14 +10,14 @@
}, },
"devDependencies": { "devDependencies": {
"@types/mdast": "4.0.4", "@types/mdast": "4.0.4",
"@types/node": "22.18.10", "@types/node": "24.9.1",
"@vitest/coverage-v8": "3.2.4", "@vitest/coverage-v8": "3.2.4",
"mdast-util-to-string": "4.0.0", "mdast-util-to-string": "4.0.0",
"remark": "15.0.1", "remark": "15.0.1",
"remark-parse": "11.0.0", "remark-parse": "11.0.0",
"typescript": "5.9.3", "typescript": "5.9.3",
"unified": "11.0.5", "unified": "11.0.5",
"vite": "6.3.6", "vite": "6.4.1",
"vite-node": "3.2.4", "vite-node": "3.2.4",
"vitest": "3.2.4" "vitest": "3.2.4"
} }