mirror of
https://github.com/MisskeyIO/misskey
synced 2024-11-27 14:28:49 +09:00
Merge tag '2024.5.0-io.3c' into host
This commit is contained in:
まっちゃとーにゅ
commit
d25c7bf635
32
package.json
32
package.json
@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "misskey",
|
||||
"version": "2024.5.0-host.3b",
|
||||
"version": "2024.5.0-host.3c",
|
||||
"codename": "nasubi",
|
||||
"repository": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/MisskeyIO/misskey.git"
|
||||
},
|
||||
"packageManager": "pnpm@9.7.1",
|
||||
"packageManager": "pnpm@9.12.2",
|
||||
"workspaces": [
|
||||
"packages/frontend",
|
||||
"packages/backend",
|
||||
@ -46,31 +46,31 @@
|
||||
"cleanall": "pnpm clean-all"
|
||||
},
|
||||
"resolutions": {
|
||||
"@tensorflow/tfjs-core": "4.20.0",
|
||||
"chokidar": "3.6.0",
|
||||
"esbuild": "0.23.0",
|
||||
"@tensorflow/tfjs-core": "4.21.0",
|
||||
"chokidar": "4.0.1",
|
||||
"esbuild": "0.24.0",
|
||||
"lodash": "4.17.21",
|
||||
"sharp": "0.33.4"
|
||||
"sharp": "0.33.5"
|
||||
},
|
||||
"dependencies": {
|
||||
"cssnano": "7.0.5",
|
||||
"execa": "9.3.0",
|
||||
"cssnano": "7.0.6",
|
||||
"execa": "9.4.1",
|
||||
"js-yaml": "4.1.0",
|
||||
"postcss": "8.4.41",
|
||||
"terser": "5.31.5",
|
||||
"typescript": "5.5.4"
|
||||
"postcss": "8.4.47",
|
||||
"terser": "5.36.0",
|
||||
"typescript": "5.6.3"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/node": "22.2.0",
|
||||
"@types/node": "22.7.7",
|
||||
"@typescript-eslint/eslint-plugin": "7.10.0",
|
||||
"@typescript-eslint/parser": "7.10.0",
|
||||
"cross-env": "7.0.3",
|
||||
"cypress": "13.13.2",
|
||||
"eslint": "8.57.0",
|
||||
"cypress": "13.15.0",
|
||||
"eslint": "8.57.1",
|
||||
"ncp": "2.0.0",
|
||||
"start-server-and-test": "2.0.5"
|
||||
"start-server-and-test": "2.0.8"
|
||||
},
|
||||
"optionalDependencies": {
|
||||
"@tensorflow/tfjs-core": "4.19.0"
|
||||
"@tensorflow/tfjs-core": "4.21.0"
|
||||
}
|
||||
}
|
||||
|
||||
@ -46,8 +46,8 @@
|
||||
"@swc/core-win32-arm64-msvc": "1.5.7",
|
||||
"@swc/core-win32-ia32-msvc": "1.5.7",
|
||||
"@swc/core-win32-x64-msvc": "1.5.7",
|
||||
"@tensorflow/tfjs": "4.19.0",
|
||||
"@tensorflow/tfjs-node": "4.19.0",
|
||||
"@tensorflow/tfjs": "4.21.0",
|
||||
"@tensorflow/tfjs-node": "4.21.0",
|
||||
"bufferutil": "4.0.8",
|
||||
"slacc-android-arm-eabi": "0.0.10",
|
||||
"slacc-android-arm64": "0.0.10",
|
||||
@ -66,15 +66,15 @@
|
||||
},
|
||||
"dependencies": {
|
||||
"@authenio/samlify-node-xmllint": "2.0.0",
|
||||
"@aws-sdk/client-s3": "3.627.0",
|
||||
"@aws-sdk/lib-storage": "3.627.0",
|
||||
"@bull-board/api": "5.21.3",
|
||||
"@bull-board/fastify": "5.21.3",
|
||||
"@bull-board/ui": "5.21.3",
|
||||
"@discordapp/twemoji": "15.0.3",
|
||||
"@elastic/elasticsearch": "^8.14.0",
|
||||
"@aws-sdk/client-s3": "3.675.0",
|
||||
"@aws-sdk/lib-storage": "3.675.0",
|
||||
"@bull-board/api": "5.23.0",
|
||||
"@bull-board/fastify": "5.23.0",
|
||||
"@bull-board/ui": "5.23.0",
|
||||
"@discordapp/twemoji": "15.1.0",
|
||||
"@elastic/elasticsearch": "8.15.1",
|
||||
"@fastify/accepts": "4.3.0",
|
||||
"@fastify/cookie": "9.3.1",
|
||||
"@fastify/cookie": "9.4.0",
|
||||
"@fastify/cors": "9.0.1",
|
||||
"@fastify/express": "3.0.0",
|
||||
"@fastify/formbody": "7.4.0",
|
||||
@ -84,14 +84,14 @@
|
||||
"@fastify/view": "9.1.0",
|
||||
"@misskey-dev/sharp-read-bmp": "1.2.0",
|
||||
"@misskey-dev/summaly": "5.1.0",
|
||||
"@napi-rs/canvas": "0.1.53",
|
||||
"@nestjs/common": "10.3.10",
|
||||
"@nestjs/core": "10.3.10",
|
||||
"@nestjs/testing": "10.3.10",
|
||||
"@napi-rs/canvas": "0.1.58",
|
||||
"@nestjs/common": "10.4.5",
|
||||
"@nestjs/core": "10.4.5",
|
||||
"@nestjs/testing": "10.4.5",
|
||||
"@peertube/http-signature": "1.7.0",
|
||||
"@simplewebauthn/server": "10.0.1",
|
||||
"@sinonjs/fake-timers": "11.2.2",
|
||||
"@smithy/node-http-handler": "3.1.4",
|
||||
"@sinonjs/fake-timers": "11.3.1",
|
||||
"@smithy/node-http-handler": "3.2.4",
|
||||
"@swc/cli": "0.3.12",
|
||||
"@swc/core": "1.5.7",
|
||||
"@twemoji/parser": "15.1.1",
|
||||
@ -102,16 +102,16 @@
|
||||
"bcryptjs": "2.4.3",
|
||||
"blurhash": "2.0.5",
|
||||
"body-parser": "1.20.2",
|
||||
"bullmq": "5.12.3",
|
||||
"bullmq": "5.21.1",
|
||||
"cacheable-lookup": "7.0.0",
|
||||
"cbor": "9.0.2",
|
||||
"chalk": "5.3.0",
|
||||
"chalk-template": "1.1.0",
|
||||
"chokidar": "3.6.0",
|
||||
"chokidar": "4.0.1",
|
||||
"cli-highlight": "2.1.11",
|
||||
"color-convert": "2.0.1",
|
||||
"content-disposition": "0.5.4",
|
||||
"date-fns": "3.6.0",
|
||||
"date-fns": "4.1.0",
|
||||
"deep-email-validator": "0.1.21",
|
||||
"fastify": "4.28.1",
|
||||
"fastify-http-errors-enhanced": "5.0.4",
|
||||
@ -119,9 +119,9 @@
|
||||
"feed": "4.2.2",
|
||||
"file-type": "19.4.0",
|
||||
"fluent-ffmpeg": "2.1.3",
|
||||
"form-data": "4.0.0",
|
||||
"got": "14.4.2",
|
||||
"happy-dom": "14.12.3",
|
||||
"form-data": "4.0.1",
|
||||
"got": "14.4.3",
|
||||
"happy-dom": "15.7.4",
|
||||
"hpagent": "1.2.0",
|
||||
"htmlescape": "1.1.1",
|
||||
"http-link-header": "1.1.3",
|
||||
@ -129,9 +129,9 @@
|
||||
"ip-cidr": "3.1.0",
|
||||
"ipaddr.js": "2.2.0",
|
||||
"is-svg": "5.1.0",
|
||||
"jose": "5.6.3",
|
||||
"jose": "5.9.6",
|
||||
"js-yaml": "4.1.0",
|
||||
"jsdom": "24.1.1",
|
||||
"jsdom": "25.0.1",
|
||||
"json5": "2.2.3",
|
||||
"jsonld": "8.3.2",
|
||||
"jsrsasign": "11.1.0",
|
||||
@ -146,17 +146,17 @@
|
||||
"nested-property": "4.0.0",
|
||||
"node-fetch": "3.3.2",
|
||||
"node-forge": "1.3.1",
|
||||
"nodemailer": "6.9.14",
|
||||
"nodemailer": "6.9.15",
|
||||
"nsfwjs": "2.4.2",
|
||||
"oauth": "0.10.0",
|
||||
"oauth2orize": "1.12.0",
|
||||
"oauth2orize-pkce": "0.1.2",
|
||||
"os-utils": "0.0.14",
|
||||
"otpauth": "9.3.1",
|
||||
"otpauth": "9.3.4",
|
||||
"parse5": "7.1.2",
|
||||
"pg": "8.12.0",
|
||||
"pino": "9.3.2",
|
||||
"pino-pretty": "11.2.2",
|
||||
"pg": "8.13.0",
|
||||
"pino": "9.5.0",
|
||||
"pino-pretty": "11.3.0",
|
||||
"pkce-challenge": "4.1.0",
|
||||
"probe-image-size": "7.2.3",
|
||||
"promise-limit": "2.7.0",
|
||||
@ -165,7 +165,7 @@
|
||||
"qrcode": "1.5.4",
|
||||
"random-seed": "0.3.0",
|
||||
"ratelimiter": "3.4.1",
|
||||
"re2": "1.21.3",
|
||||
"re2": "1.21.4",
|
||||
"redis-lock": "0.1.4",
|
||||
"reflect-metadata": "0.2.2",
|
||||
"rename": "1.0.4",
|
||||
@ -174,17 +174,17 @@
|
||||
"samlify": "2.8.11",
|
||||
"sanitize-html": "2.13.0",
|
||||
"secure-json-parse": "2.7.0",
|
||||
"sharp": "0.33.4",
|
||||
"sharp": "0.33.5",
|
||||
"slacc": "0.0.10",
|
||||
"strict-event-emitter-types": "2.0.0",
|
||||
"stringz": "2.1.0",
|
||||
"systeminformation": "5.23.4",
|
||||
"systeminformation": "5.23.5",
|
||||
"tinycolor2": "1.6.0",
|
||||
"tmp": "0.2.3",
|
||||
"tsc-alias": "1.8.10",
|
||||
"tsconfig-paths": "4.2.0",
|
||||
"typeorm": "0.3.20",
|
||||
"typescript": "5.5.4",
|
||||
"typescript": "5.6.3",
|
||||
"ulid": "2.3.0",
|
||||
"vary": "1.1.2",
|
||||
"web-push": "3.6.7",
|
||||
@ -195,39 +195,39 @@
|
||||
"devDependencies": {
|
||||
"@jest/globals": "29.7.0",
|
||||
"@misskey-dev/eslint-plugin": "1.0.0",
|
||||
"@nestjs/platform-express": "10.3.10",
|
||||
"@nestjs/platform-express": "10.4.5",
|
||||
"@simplewebauthn/types": "10.0.0",
|
||||
"@swc/jest": "0.2.36",
|
||||
"@types/accepts": "1.3.7",
|
||||
"@types/archiver": "6.0.2",
|
||||
"@types/bcryptjs": "2.4.6",
|
||||
"@types/body-parser": "1.19.5",
|
||||
"@types/color-convert": "2.0.3",
|
||||
"@types/color-convert": "2.0.4",
|
||||
"@types/content-disposition": "0.5.8",
|
||||
"@types/fluent-ffmpeg": "2.1.25",
|
||||
"@types/fluent-ffmpeg": "2.1.26",
|
||||
"@types/htmlescape": "^1.1.3",
|
||||
"@types/http-link-header": "1.0.7",
|
||||
"@types/jest": "29.5.12",
|
||||
"@types/jest": "29.5.13",
|
||||
"@types/js-yaml": "4.0.9",
|
||||
"@types/jsdom": "21.1.7",
|
||||
"@types/jsonld": "1.5.15",
|
||||
"@types/jsrsasign": "10.5.14",
|
||||
"@types/mime-types": "2.1.4",
|
||||
"@types/ms": "0.7.34",
|
||||
"@types/node": "22.2.0",
|
||||
"@types/node": "22.7.7",
|
||||
"@types/node-forge": "1.3.11",
|
||||
"@types/nodemailer": "6.4.15",
|
||||
"@types/oauth": "0.9.5",
|
||||
"@types/nodemailer": "6.4.16",
|
||||
"@types/oauth": "0.9.6",
|
||||
"@types/oauth2orize": "1.11.5",
|
||||
"@types/oauth2orize-pkce": "0.1.2",
|
||||
"@types/pg": "8.11.6",
|
||||
"@types/pg": "8.11.10",
|
||||
"@types/pug": "2.0.10",
|
||||
"@types/punycode": "2.1.4",
|
||||
"@types/qrcode": "1.5.5",
|
||||
"@types/random-seed": "0.3.5",
|
||||
"@types/ratelimiter": "3.4.6",
|
||||
"@types/rename": "1.0.7",
|
||||
"@types/sanitize-html": "2.11.0",
|
||||
"@types/sanitize-html": "2.13.0",
|
||||
"@types/semver": "7.5.8",
|
||||
"@types/simple-oauth2": "5.0.7",
|
||||
"@types/sinonjs__fake-timers": "8.1.5",
|
||||
@ -238,15 +238,15 @@
|
||||
"@types/ws": "8.5.12",
|
||||
"@typescript-eslint/eslint-plugin": "7.10.0",
|
||||
"@typescript-eslint/parser": "7.10.0",
|
||||
"aws-sdk-client-mock": "4.0.1",
|
||||
"aws-sdk-client-mock": "4.1.0",
|
||||
"cross-env": "7.0.3",
|
||||
"eslint": "8.57.0",
|
||||
"eslint-plugin-import": "2.29.1",
|
||||
"execa": "9.3.0",
|
||||
"eslint": "8.57.1",
|
||||
"eslint-plugin-import": "2.31.0",
|
||||
"execa": "9.4.1",
|
||||
"fkill": "^9.0.0",
|
||||
"jest": "29.7.0",
|
||||
"jest-mock": "29.7.0",
|
||||
"nodemon": "3.1.4",
|
||||
"nodemon": "3.1.7",
|
||||
"pid-port": "1.0.0",
|
||||
"simple-oauth2": "5.1.0"
|
||||
}
|
||||
|
||||
@ -266,10 +266,7 @@ export class FileInfoService {
|
||||
}
|
||||
|
||||
private async *asyncIterateFrames(cwd: string, command: FFmpeg.FfmpegCommand): AsyncGenerator<string, void> {
|
||||
const watcher = new FSWatcher({
|
||||
cwd,
|
||||
disableGlobbing: true,
|
||||
});
|
||||
const watcher = new FSWatcher({ cwd });
|
||||
let finished = false;
|
||||
command.once('end', () => {
|
||||
finished = true;
|
||||
|
||||
@ -17,34 +17,34 @@
|
||||
"lint": "pnpm typecheck && pnpm eslint"
|
||||
},
|
||||
"dependencies": {
|
||||
"@discordapp/twemoji": "15.0.3",
|
||||
"@discordapp/twemoji": "15.1.0",
|
||||
"@github/webauthn-json": "2.1.1",
|
||||
"@isaacs/ttlcache": "1.4.1",
|
||||
"@mcaptcha/vanilla-glue": "0.1.0-alpha-3",
|
||||
"@misskey-dev/browser-image-resizer": "2024.1.0",
|
||||
"@rollup/plugin-json": "6.1.0",
|
||||
"@rollup/plugin-replace": "5.0.7",
|
||||
"@rollup/plugin-typescript": "11.1.6",
|
||||
"@rollup/pluginutils": "5.1.0",
|
||||
"@syuilo/aiscript": "0.18.0",
|
||||
"@tabler/icons-webfont": "3.12.0",
|
||||
"@rollup/plugin-replace": "6.0.1",
|
||||
"@rollup/plugin-typescript": "12.1.1",
|
||||
"@rollup/pluginutils": "5.1.2",
|
||||
"@syuilo/aiscript": "0.19.0",
|
||||
"@tabler/icons-webfont": "3.19.0",
|
||||
"@twemoji/parser": "15.1.1",
|
||||
"@vitejs/plugin-vue": "5.1.2",
|
||||
"@vue/compiler-sfc": "3.4.15",
|
||||
"@vitejs/plugin-vue": "5.1.4",
|
||||
"@vue/compiler-sfc": "3.5.12",
|
||||
"aiscript-vscode": "github:aiscript-dev/aiscript-vscode#v0.1.9",
|
||||
"astring": "1.8.6",
|
||||
"astring": "1.9.0",
|
||||
"broadcast-channel": "7.0.0",
|
||||
"buraha": "0.0.1",
|
||||
"canvas-confetti": "1.9.3",
|
||||
"chart.js": "4.4.3",
|
||||
"chart.js": "4.4.5",
|
||||
"chartjs-adapter-date-fns": "3.0.0",
|
||||
"chartjs-chart-matrix": "2.0.1",
|
||||
"chartjs-plugin-gradient": "0.6.1",
|
||||
"chartjs-plugin-zoom": "2.0.1",
|
||||
"chromatic": "11.7.0",
|
||||
"chromatic": "11.12.6",
|
||||
"compare-versions": "6.1.1",
|
||||
"cropperjs": "2.0.0-rc.0",
|
||||
"date-fns": "3.6.0",
|
||||
"date-fns": "4.1.0",
|
||||
"escape-regexp": "0.0.1",
|
||||
"estree-walker": "3.0.3",
|
||||
"eventemitter3": "5.0.1",
|
||||
@ -59,53 +59,53 @@
|
||||
"misskey-reversi": "workspace:*",
|
||||
"photoswipe": "5.4.4",
|
||||
"punycode": "2.3.1",
|
||||
"rollup": "4.20.0",
|
||||
"rollup": "4.24.0",
|
||||
"sanitize-html": "2.13.0",
|
||||
"sass": "1.77.8",
|
||||
"shiki": "1.12.1",
|
||||
"sass": "1.80.3",
|
||||
"shiki": "1.22.0",
|
||||
"strict-event-emitter-types": "2.0.0",
|
||||
"textarea-caret": "3.1.0",
|
||||
"three": "0.167.1",
|
||||
"three": "0.169.0",
|
||||
"throttle-debounce": "5.0.2",
|
||||
"tinycolor2": "1.6.0",
|
||||
"tsc-alias": "1.8.10",
|
||||
"tsconfig-paths": "4.2.0",
|
||||
"typescript": "5.5.4",
|
||||
"typescript": "5.6.3",
|
||||
"uuid": "10.0.0",
|
||||
"v-code-diff": "1.12.1",
|
||||
"vite": "5.4.0",
|
||||
"vue": "3.4.15",
|
||||
"v-code-diff": "1.13.1",
|
||||
"vite": "5.4.9",
|
||||
"vue": "3.5.12",
|
||||
"vuedraggable": "next"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@misskey-dev/eslint-plugin": "1.0.0",
|
||||
"@misskey-dev/summaly": "5.1.0",
|
||||
"@storybook/addon-actions": "8.2.8",
|
||||
"@storybook/addon-essentials": "8.2.8",
|
||||
"@storybook/addon-interactions": "8.2.8",
|
||||
"@storybook/addon-links": "8.2.8",
|
||||
"@storybook/addon-mdx-gfm": "8.2.8",
|
||||
"@storybook/addon-storysource": "8.2.8",
|
||||
"@storybook/blocks": "8.2.8",
|
||||
"@storybook/components": "8.2.8",
|
||||
"@storybook/core-events": "8.2.8",
|
||||
"@storybook/manager-api": "8.2.8",
|
||||
"@storybook/preview-api": "8.2.8",
|
||||
"@storybook/react": "8.2.8",
|
||||
"@storybook/react-vite": "8.2.8",
|
||||
"@storybook/test": "8.2.8",
|
||||
"@storybook/theming": "8.2.8",
|
||||
"@storybook/types": "8.2.8",
|
||||
"@storybook/vue3": "8.2.8",
|
||||
"@storybook/vue3-vite": "8.2.8",
|
||||
"@storybook/addon-actions": "8.3.6",
|
||||
"@storybook/addon-essentials": "8.3.6",
|
||||
"@storybook/addon-interactions": "8.3.6",
|
||||
"@storybook/addon-links": "8.3.6",
|
||||
"@storybook/addon-mdx-gfm": "8.3.6",
|
||||
"@storybook/addon-storysource": "8.3.6",
|
||||
"@storybook/blocks": "8.3.6",
|
||||
"@storybook/components": "8.3.6",
|
||||
"@storybook/core-events": "8.3.6",
|
||||
"@storybook/manager-api": "8.3.6",
|
||||
"@storybook/preview-api": "8.3.6",
|
||||
"@storybook/react": "8.3.6",
|
||||
"@storybook/react-vite": "8.3.6",
|
||||
"@storybook/test": "8.3.6",
|
||||
"@storybook/theming": "8.3.6",
|
||||
"@storybook/types": "8.3.6",
|
||||
"@storybook/vue3": "8.3.6",
|
||||
"@storybook/vue3-vite": "8.3.6",
|
||||
"@testing-library/vue": "8.1.0",
|
||||
"@types/escape-regexp": "0.0.3",
|
||||
"@types/estree": "1.0.5",
|
||||
"@types/estree": "1.0.6",
|
||||
"@types/matter-js": "0.19.7",
|
||||
"@types/micromatch": "4.0.9",
|
||||
"@types/node": "22.2.0",
|
||||
"@types/node": "22.7.7",
|
||||
"@types/punycode": "2.1.4",
|
||||
"@types/sanitize-html": "2.11.0",
|
||||
"@types/sanitize-html": "2.13.0",
|
||||
"@types/throttle-debounce": "5.0.2",
|
||||
"@types/tinycolor2": "1.4.6",
|
||||
"@types/uuid": "10.0.0",
|
||||
@ -113,31 +113,31 @@
|
||||
"@typescript-eslint/eslint-plugin": "7.10.0",
|
||||
"@typescript-eslint/parser": "7.10.0",
|
||||
"@vitest/coverage-v8": "0.34.6",
|
||||
"@vue/runtime-core": "3.4.15",
|
||||
"acorn": "8.12.1",
|
||||
"@vue/runtime-core": "3.5.12",
|
||||
"acorn": "8.13.0",
|
||||
"cross-env": "7.0.3",
|
||||
"cypress": "13.13.2",
|
||||
"eslint": "8.57.0",
|
||||
"eslint-plugin-import": "2.29.1",
|
||||
"eslint-plugin-vue": "9.27.0",
|
||||
"cypress": "13.15.0",
|
||||
"eslint": "8.57.1",
|
||||
"eslint-plugin-import": "2.31.0",
|
||||
"eslint-plugin-vue": "9.29.1",
|
||||
"fast-glob": "3.3.2",
|
||||
"happy-dom": "14.12.3",
|
||||
"happy-dom": "15.7.4",
|
||||
"intersection-observer": "0.12.2",
|
||||
"micromatch": "4.0.7",
|
||||
"msw": "2.3.5",
|
||||
"micromatch": "4.0.8",
|
||||
"msw": "2.4.11",
|
||||
"msw-storybook-addon": "2.0.3",
|
||||
"nodemon": "3.1.4",
|
||||
"nodemon": "3.1.7",
|
||||
"prettier": "3.3.3",
|
||||
"react": "18.3.1",
|
||||
"react-dom": "18.3.1",
|
||||
"start-server-and-test": "2.0.5",
|
||||
"storybook": "8.2.8",
|
||||
"start-server-and-test": "2.0.8",
|
||||
"storybook": "8.3.6",
|
||||
"storybook-addon-misskey-theme": "github:misskey-dev/storybook-addon-misskey-theme",
|
||||
"vite-plugin-turbosnap": "1.0.3",
|
||||
"vitest": "0.34.6",
|
||||
"vitest-fetch-mock": "0.2.2",
|
||||
"vue-component-type-helpers": "2.0.29",
|
||||
"vue-component-type-helpers": "2.1.6",
|
||||
"vue-eslint-parser": "9.4.3",
|
||||
"vue-tsc": "2.0.29"
|
||||
"vue-tsc": "2.1.6"
|
||||
}
|
||||
}
|
||||
|
||||
@ -100,8 +100,8 @@ async function requestRender() {
|
||||
sitekey: props.sitekey,
|
||||
theme: defaultStore.state.darkMode ? 'dark' : 'light',
|
||||
callback: callback,
|
||||
'expired-callback': callback,
|
||||
'error-callback': callback,
|
||||
'expired-callback': () => callback(undefined),
|
||||
'error-callback': () => callback(undefined),
|
||||
});
|
||||
} else if (props.provider === 'mcaptcha' && props.instanceUrl && props.sitekey) {
|
||||
const { default: Widget } = await import('@mcaptcha/vanilla-glue');
|
||||
|
||||
@ -172,7 +172,7 @@ SPDX-License-Identifier: AGPL-3.0-only
|
||||
</button>
|
||||
</div>
|
||||
<MkButton v-if="reactionTabType" :class="$style.reactionMuteButton" @click="reactionMuteToggle(reactionTabTypeTrimLocal)">
|
||||
<i :class="!mutedReactions.includes(reactionTabTypeTrimLocal) ? 'ti ti-mood-happy' : 'ti ti-mood-off'"/>
|
||||
<i :class="!mutedReactions.includes(reactionTabTypeTrimLocal) ? 'ti ti-mood-off' : 'ti ti-mood-happy'"/>
|
||||
{{ !mutedReactions.includes(reactionTabTypeTrimLocal) ? i18n.ts.muteThisReaction : i18n.ts.unmuteThisReaction }}
|
||||
</MkButton>
|
||||
<MkPagination v-if="reactionTabType" :key="reactionTabType" :pagination="reactionsPagination" :disableAutoLoad="true">
|
||||
|
||||
@ -5,7 +5,7 @@ SPDX-License-Identifier: AGPL-3.0-only
|
||||
|
||||
<template>
|
||||
<MkPullToRefresh :refresher="() => reload()">
|
||||
<MkPagination ref="pagingComponent" :pagination="pagination">
|
||||
<MkPagination ref="pagingComponent" :pagination="pagination" :filter="filterMutedNotification">
|
||||
<template #empty>
|
||||
<div class="_fullinfo">
|
||||
<img :src="infoImageUrl" class="_ghost"/>
|
||||
@ -34,6 +34,7 @@ import { i18n } from '@/i18n.js';
|
||||
import { notificationTypes } from '@/const.js';
|
||||
import { infoImageUrl } from '@/instance.js';
|
||||
import { defaultStore } from '@/store.js';
|
||||
import { filterMutedNotification } from '@/scripts/filter-muted-notification.js';
|
||||
import MkPullToRefresh from '@/components/MkPullToRefresh.vue';
|
||||
import * as Misskey from 'misskey-js';
|
||||
|
||||
@ -63,7 +64,7 @@ function onNotification(notification) {
|
||||
useStream().send('readNotification');
|
||||
}
|
||||
|
||||
if (!isMuted) {
|
||||
if (!isMuted && filterMutedNotification(notification)) {
|
||||
pagingComponent.value?.prepend(notification);
|
||||
}
|
||||
}
|
||||
|
||||
@ -84,6 +84,7 @@ const props = withDefaults(defineProps<{
|
||||
pagination: Paging;
|
||||
disableAutoLoad?: boolean;
|
||||
displayLimit?: number;
|
||||
filter?: (item: MisskeyEntity) => boolean;
|
||||
}>(), {
|
||||
displayLimit: 20,
|
||||
});
|
||||
@ -178,6 +179,8 @@ async function init(): Promise<void> {
|
||||
limit: props.pagination.limit ?? 10,
|
||||
allowPartial: true,
|
||||
}).then(res => {
|
||||
res = res.filter(item => !props.filter || props.filter(item));
|
||||
|
||||
for (let i = 0; i < res.length; i++) {
|
||||
const item = res[i];
|
||||
if (i === 3) item._shouldInsertAd_ = true;
|
||||
@ -219,6 +222,8 @@ const fetchMore = async (): Promise<void> => {
|
||||
untilId: items.value[items.value.length - 1].id,
|
||||
}),
|
||||
}).then(res => {
|
||||
res = res.filter(item => !props.filter || props.filter(item));
|
||||
|
||||
for (let i = 0; i < res.length; i++) {
|
||||
const item = res[i];
|
||||
if (i === 10) item._shouldInsertAd_ = true;
|
||||
@ -283,6 +288,8 @@ const fetchMoreAhead = async (): Promise<void> => {
|
||||
sinceId: items.value[0].id,
|
||||
}),
|
||||
}).then(res => {
|
||||
res = res.filter(item => !props.filter || props.filter(item));
|
||||
|
||||
if (res.length === 0) {
|
||||
items.value = res.concat(items.value);
|
||||
more.value = false;
|
||||
|
||||
@ -4,7 +4,7 @@ SPDX-License-Identifier: AGPL-3.0-only
|
||||
-->
|
||||
|
||||
<template>
|
||||
<MkCustomEmoji v-if="reaction[0] === ':'" ref="elRef" :name="reaction" :normal="true" :noStyle="noStyle" :url="emojiUrl"/>
|
||||
<MkCustomEmoji v-if="reaction[0] === ':'" ref="elRef" :name="reaction" :normal="true" :noStyle="noStyle" :url="emojiUrl" :fallbackToImage="true"/>
|
||||
<MkEmoji v-else ref="elRef" :emoji="reaction" :normal="true" :noStyle="noStyle"/>
|
||||
</template>
|
||||
|
||||
|
||||
@ -4,7 +4,8 @@ SPDX-License-Identifier: AGPL-3.0-only
|
||||
-->
|
||||
|
||||
<template>
|
||||
<img v-if="errored" src="/client-assets/dummy.png" :alt="alt" :title="alt" decoding="async" :class="[$style.root, { [$style.normal]: normal, [$style.noStyle]: noStyle }]"/>
|
||||
<span v-if="errored && !fallbackToImage">:{{ customEmojiName }}:</span>
|
||||
<img v-else-if="errored" src="/client-assets/dummy.png" :alt="alt" :title="alt" decoding="async" :class="[$style.root, { [$style.normal]: normal, [$style.noStyle]: noStyle }]"/>
|
||||
<img
|
||||
v-else
|
||||
:class="[$style.root, { [$style.normal]: normal, [$style.noStyle]: noStyle }]"
|
||||
@ -39,6 +40,7 @@ const props = defineProps<{
|
||||
useOriginalSize?: boolean;
|
||||
menu?: boolean;
|
||||
menuReaction?: boolean;
|
||||
fallbackToImage?: boolean;
|
||||
}>();
|
||||
|
||||
const react = inject<((name: string) => void) | null>('react', null);
|
||||
|
||||
16
packages/frontend/src/scripts/filter-muted-notification.ts
Normal file
16
packages/frontend/src/scripts/filter-muted-notification.ts
Normal file
@ -0,0 +1,16 @@
|
||||
import * as Misskey from 'misskey-js';
|
||||
import { defaultStore } from '@/store.js';
|
||||
|
||||
export function filterMutedNotification(notification: Misskey.entities.Notification): boolean {
|
||||
switch (notification.type) {
|
||||
case 'reaction':
|
||||
if (defaultStore.state.mutedReactions.includes(notification.reaction.replace('@.', ''))) return false;
|
||||
break;
|
||||
case 'reaction:grouped':
|
||||
notification.reactions = notification.reactions.filter(reaction => !defaultStore.state.mutedReactions.includes(reaction.reaction.replace('@.', '')));
|
||||
if (notification.reactions.length === 0) return false;
|
||||
break;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
@ -51,6 +51,7 @@ import { swInject } from './sw-inject.js';
|
||||
import XNotification from './notification.vue';
|
||||
import { popups } from '@/os.js';
|
||||
import { pendingApiRequestsCount } from '@/scripts/misskey-api.js';
|
||||
import { filterMutedNotification } from '@/scripts/filter-muted-notification.js';
|
||||
import { uploads } from '@/scripts/upload.js';
|
||||
import * as sound from '@/scripts/sound.js';
|
||||
import { $i } from '@/account.js';
|
||||
@ -73,6 +74,8 @@ function onNotification(notification: Misskey.entities.Notification, isClient =
|
||||
useStream().send('readNotification');
|
||||
}
|
||||
|
||||
if (!filterMutedNotification(notification)) return;
|
||||
|
||||
notifications.value.unshift(notification);
|
||||
window.setTimeout(() => {
|
||||
if (notifications.value.length > 3) notifications.value.pop();
|
||||
|
||||
@ -107,6 +107,11 @@ export function getConfig(): UserConfig {
|
||||
}
|
||||
},
|
||||
},
|
||||
preprocessorOptions: {
|
||||
scss: {
|
||||
api: 'modern-compiler',
|
||||
},
|
||||
},
|
||||
},
|
||||
|
||||
define: {
|
||||
|
||||
@ -26,19 +26,19 @@
|
||||
"devDependencies": {
|
||||
"@misskey-dev/eslint-plugin": "1.0.0",
|
||||
"@types/matter-js": "0.19.7",
|
||||
"@types/node": "22.2.0",
|
||||
"@types/node": "22.7.7",
|
||||
"@types/seedrandom": "3.0.8",
|
||||
"@typescript-eslint/eslint-plugin": "7.10.0",
|
||||
"@typescript-eslint/parser": "7.10.0",
|
||||
"eslint": "8.57.0",
|
||||
"nodemon": "3.1.4",
|
||||
"typescript": "5.5.4"
|
||||
"eslint": "8.57.1",
|
||||
"nodemon": "3.1.7",
|
||||
"typescript": "5.6.3"
|
||||
},
|
||||
"files": [
|
||||
"built"
|
||||
],
|
||||
"dependencies": {
|
||||
"esbuild": "0.23.0",
|
||||
"esbuild": "0.24.0",
|
||||
"eventemitter3": "5.0.1",
|
||||
"glob": "11.0.0",
|
||||
"matter-js": "0.20.0",
|
||||
|
||||
@ -9,15 +9,15 @@
|
||||
"devDependencies": {
|
||||
"@misskey-dev/eslint-plugin": "^1.0.0",
|
||||
"@readme/openapi-parser": "2.6.0",
|
||||
"@types/node": "22.2.0",
|
||||
"@types/node": "22.7.7",
|
||||
"@typescript-eslint/eslint-plugin": "7.10.0",
|
||||
"@typescript-eslint/parser": "7.10.0",
|
||||
"eslint": "8.57.0",
|
||||
"eslint": "8.57.1",
|
||||
"openapi-types": "12.1.3",
|
||||
"openapi-typescript": "6.7.6",
|
||||
"ts-case-convert": "2.0.7",
|
||||
"tsx": "4.17.0",
|
||||
"typescript": "5.5.4"
|
||||
"ts-case-convert": "2.1.0",
|
||||
"tsx": "4.19.1",
|
||||
"typescript": "5.6.3"
|
||||
},
|
||||
"files": [
|
||||
"built"
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{
|
||||
"type": "module",
|
||||
"name": "misskey-js",
|
||||
"version": "2024.5.0-host.3b",
|
||||
"version": "2024.5.0-host.3c",
|
||||
"description": "Misskey SDK for JavaScript",
|
||||
"types": "./built/dts/index.d.ts",
|
||||
"exports": {
|
||||
@ -35,22 +35,22 @@
|
||||
"url": "git+https://github.com/misskey-dev/misskey.js.git"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@microsoft/api-extractor": "7.47.5",
|
||||
"@microsoft/api-extractor": "7.47.11",
|
||||
"@misskey-dev/eslint-plugin": "1.0.0",
|
||||
"@swc/jest": "0.2.36",
|
||||
"@types/jest": "29.5.12",
|
||||
"@types/node": "22.2.0",
|
||||
"@types/jest": "29.5.13",
|
||||
"@types/node": "22.7.7",
|
||||
"@typescript-eslint/eslint-plugin": "7.10.0",
|
||||
"@typescript-eslint/parser": "7.10.0",
|
||||
"eslint": "8.57.0",
|
||||
"eslint": "8.57.1",
|
||||
"jest": "29.7.0",
|
||||
"jest-fetch-mock": "3.0.3",
|
||||
"jest-websocket-mock": "2.5.0",
|
||||
"mock-socket": "9.3.1",
|
||||
"ncp": "2.0.0",
|
||||
"nodemon": "3.1.4",
|
||||
"tsd": "0.31.1",
|
||||
"typescript": "5.5.4"
|
||||
"nodemon": "3.1.7",
|
||||
"tsd": "0.31.2",
|
||||
"typescript": "5.6.3"
|
||||
},
|
||||
"files": [
|
||||
"built",
|
||||
|
||||
@ -25,16 +25,16 @@
|
||||
},
|
||||
"devDependencies": {
|
||||
"@misskey-dev/eslint-plugin": "1.0.0",
|
||||
"@types/node": "22.2.0",
|
||||
"@types/node": "22.7.7",
|
||||
"@typescript-eslint/eslint-plugin": "7.10.0",
|
||||
"@typescript-eslint/parser": "7.10.0",
|
||||
"eslint": "8.57.0",
|
||||
"nodemon": "3.1.4",
|
||||
"typescript": "5.5.4"
|
||||
"eslint": "8.57.1",
|
||||
"nodemon": "3.1.7",
|
||||
"typescript": "5.6.3"
|
||||
},
|
||||
"dependencies": {
|
||||
"crc-32": "1.2.2",
|
||||
"esbuild": "0.23.0",
|
||||
"esbuild": "0.24.0",
|
||||
"glob": "11.0.0"
|
||||
},
|
||||
"files": [
|
||||
|
||||
@ -9,18 +9,18 @@
|
||||
"lint": "pnpm typecheck && pnpm eslint"
|
||||
},
|
||||
"dependencies": {
|
||||
"esbuild": "0.23.0",
|
||||
"esbuild": "0.24.0",
|
||||
"idb-keyval": "6.2.1",
|
||||
"misskey-js": "workspace:*"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@misskey-dev/eslint-plugin": "1.0.0",
|
||||
"@types/serviceworker": "0.0.92",
|
||||
"@types/serviceworker": "0.0.101",
|
||||
"@typescript-eslint/parser": "7.10.0",
|
||||
"eslint": "8.57.0",
|
||||
"eslint-plugin-import": "2.29.1",
|
||||
"nodemon": "3.1.4",
|
||||
"typescript": "5.5.4"
|
||||
"eslint": "8.57.1",
|
||||
"eslint-plugin-import": "2.31.0",
|
||||
"nodemon": "3.1.7",
|
||||
"typescript": "5.6.3"
|
||||
},
|
||||
"type": "module"
|
||||
}
|
||||
|
||||
8418
pnpm-lock.yaml
8418
pnpm-lock.yaml
File diff suppressed because it is too large
Load Diff
@ -15,7 +15,7 @@
|
||||
"mdast-util-to-string": "4.0.0",
|
||||
"remark": "15.0.1",
|
||||
"remark-parse": "11.0.0",
|
||||
"typescript": "5.3.3",
|
||||
"typescript": "5.6.3",
|
||||
"unified": "11.0.4",
|
||||
"vite": "5.0.12",
|
||||
"vite-node": "1.1.3",
|
||||
|
||||
Loading…
Reference in New Issue
Block a user