Merge branch 'develop' into renovate/major-backend-update-dependencies
This commit is contained in:
commit
607e4ed4de
|
|
@ -28,7 +28,7 @@ services:
|
|||
|
||||
db:
|
||||
restart: unless-stopped
|
||||
image: postgres:15-alpine
|
||||
image: postgres:18-alpine
|
||||
networks:
|
||||
- internal_network
|
||||
environment:
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@ body:
|
|||
* Installation Method or Hosting Service: docker compose, k8s/docker, systemd, "Misskey install shell script", development environment
|
||||
* Misskey: 2025.x.x
|
||||
* Node: 20.x.x
|
||||
* PostgreSQL: 15.x.x
|
||||
* PostgreSQL: 18.x.x
|
||||
* Redis: 7.x.x
|
||||
* OS and Architecture: Ubuntu 24.04.2 LTS aarch64
|
||||
value: |
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ jobs:
|
|||
|
||||
services:
|
||||
postgres:
|
||||
image: postgres:15
|
||||
image: postgres:18
|
||||
ports:
|
||||
- 54312:5432
|
||||
env:
|
||||
|
|
@ -117,7 +117,7 @@ jobs:
|
|||
|
||||
services:
|
||||
postgres:
|
||||
image: postgres:15
|
||||
image: postgres:18
|
||||
ports:
|
||||
- 54312:5432
|
||||
env:
|
||||
|
|
@ -165,7 +165,7 @@ jobs:
|
|||
|
||||
services:
|
||||
postgres:
|
||||
image: postgres:15
|
||||
image: postgres:18
|
||||
ports:
|
||||
- 54312:5432
|
||||
env:
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@ jobs:
|
|||
|
||||
services:
|
||||
postgres:
|
||||
image: postgres:15
|
||||
image: postgres:18
|
||||
ports:
|
||||
- 54312:5432
|
||||
env:
|
||||
|
|
|
|||
19
CHANGELOG.md
19
CHANGELOG.md
|
|
@ -1,12 +1,22 @@
|
|||
## 2025.11.1
|
||||
## Unreleased
|
||||
|
||||
### General
|
||||
-
|
||||
|
||||
### Client
|
||||
-
|
||||
|
||||
### Server
|
||||
-
|
||||
|
||||
|
||||
## 2025.11.1
|
||||
|
||||
### Client
|
||||
|
||||
- Enhance: リアクションの受け入れ設定にキャプションを追加 #15921
|
||||
- Fix: ページの内容がはみ出ることがある問題を修正
|
||||
- Fix: ナビゲーションバーを下に表示しているときに、項目数が多いと表示が崩れる問題を修正
|
||||
- Fix: ヘッダーメニューのチャンネルの新規作成の項目でチャンネル作成ページに飛べない問題を修正 #16816
|
||||
- Fix: ラジオボタンに空白の選択肢が表示される問題を修正
|
||||
(Cherry-picked from https://github.com/MisskeyIO/misskey/pull/1105)
|
||||
|
|
@ -14,10 +24,15 @@
|
|||
- Fix: 投稿フォームのリセットボタンで注釈がリセットされない問題を修正
|
||||
- Fix: PlayのAiScriptバージョン判定(v0.x系・v1.x系の判定)が正しく動作しない問題を修正
|
||||
(Cherry-picked from https://github.com/MisskeyIO/misskey/pull/1129)
|
||||
- Fix: フォロー申請をキャンセルする際の確認ダイアログの文言が不正確な問題を修正
|
||||
- Fix: 初回読み込み時にエラーになることがある問題を修正
|
||||
- Fix: お気に入りクリップの一覧表示が正しく動作しない問題を修正
|
||||
- Fix: AiScript Misskey 拡張APIにおいて、各種関数の引数で明示的に `null` が指定されている場合のハンドリングを修正
|
||||
|
||||
### Server
|
||||
- Enhance: `clips/my-favorites` APIがページネーションに対応しました
|
||||
- Enhance: メモリ使用量を削減しました
|
||||
- Enhance: 依存関係の更新
|
||||
- Fix: ワードミュートの文字数計算を修正
|
||||
- Fix: チャンネルのリアルタイム更新時に、ロックダウン設定にて非ログイン時にノートを表示しない設定にしている場合でもノートが表示されてしまう問題を修正
|
||||
- Fix: DeepL APIのAPIキー指定方式変更に対応
|
||||
(Cherry-picked from https://github.com/MisskeyIO/misskey/pull/1096)
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ spec:
|
|||
ports:
|
||||
- containerPort: 3000
|
||||
- name: postgres
|
||||
image: postgres:15-alpine
|
||||
image: postgres:18-alpine
|
||||
env:
|
||||
- name: POSTGRES_USER
|
||||
value: "example-misskey-user"
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ services:
|
|||
|
||||
db:
|
||||
restart: always
|
||||
image: postgres:15-alpine
|
||||
image: postgres:18-alpine
|
||||
ports:
|
||||
- "5432:5432"
|
||||
env_file:
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ services:
|
|||
|
||||
db:
|
||||
restart: always
|
||||
image: postgres:15-alpine
|
||||
image: postgres:18-alpine
|
||||
networks:
|
||||
- internal_network
|
||||
env_file:
|
||||
|
|
|
|||
|
|
@ -83,6 +83,8 @@ files: "Fitxers"
|
|||
download: "Descarregar"
|
||||
driveFileDeleteConfirm: "Estàs segur que vols suprimir el fitxer \"{name}\"? Les notes associades a aquest fitxer també seran esborrades."
|
||||
unfollowConfirm: "Segur que vols deixar de seguir a {name}?"
|
||||
cancelFollowRequestConfirm: "Vols cancel·lar la teva sol·licitud de seguiment a {name}?"
|
||||
rejectFollowRequestConfirm: "Vols rebutjar la sol·licitud de seguiment de {name}?"
|
||||
exportRequested: "Has sol·licitat una exportació de dades. Això pot trigar una estona. S'afegirà a la teva unitat de disc un cop estigui completada."
|
||||
importRequested: "Has sol·licitat una importació de dades. Això pot trigar una estona."
|
||||
lists: "Llistes"
|
||||
|
|
|
|||
|
|
@ -83,6 +83,8 @@ files: "Archivos"
|
|||
download: "Descargar"
|
||||
driveFileDeleteConfirm: "¿Desea borrar el archivo \"{name}\"? Las notas que tengan este archivo como adjunto serán eliminadas"
|
||||
unfollowConfirm: "¿Desea dejar de seguir a {name}?"
|
||||
cancelFollowRequestConfirm: "¿Desea cancelar su solicitud de seguimiento a {name}?"
|
||||
rejectFollowRequestConfirm: "¿Desea rechazar la solicitud de seguimiento de {name}?"
|
||||
exportRequested: "Has solicitado la exportación. Puede llevar un tiempo. Cuando termine la exportación, se añadirá al drive"
|
||||
importRequested: "Has solicitado la importación. Puede llevar un tiempo."
|
||||
lists: "Listas"
|
||||
|
|
|
|||
|
|
@ -350,6 +350,14 @@ export interface Locale extends ILocale {
|
|||
* {name}のフォローを解除しますか?
|
||||
*/
|
||||
"unfollowConfirm": ParameterizedString<"name">;
|
||||
/**
|
||||
* {name}へのフォロー申請をキャンセルしますか?
|
||||
*/
|
||||
"cancelFollowRequestConfirm": ParameterizedString<"name">;
|
||||
/**
|
||||
* {name}からのフォロー申請を拒否しますか?
|
||||
*/
|
||||
"rejectFollowRequestConfirm": ParameterizedString<"name">;
|
||||
/**
|
||||
* エクスポートをリクエストしました。これには時間がかかる場合があります。エクスポートが終わると、「ドライブ」に追加されます。
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -83,6 +83,8 @@ files: "ファイル"
|
|||
download: "ダウンロード"
|
||||
driveFileDeleteConfirm: "ファイル「{name}」を削除しますか?このファイルを使用した一部のコンテンツも削除されます。"
|
||||
unfollowConfirm: "{name}のフォローを解除しますか?"
|
||||
cancelFollowRequestConfirm: "{name}へのフォロー申請をキャンセルしますか?"
|
||||
rejectFollowRequestConfirm: "{name}からのフォロー申請を拒否しますか?"
|
||||
exportRequested: "エクスポートをリクエストしました。これには時間がかかる場合があります。エクスポートが終わると、「ドライブ」に追加されます。"
|
||||
importRequested: "インポートをリクエストしました。これには時間がかかる場合があります。"
|
||||
lists: "リスト"
|
||||
|
|
|
|||
|
|
@ -83,6 +83,8 @@ files: "파일"
|
|||
download: "다운로드"
|
||||
driveFileDeleteConfirm: "‘{name}’ 파일을 삭제하시겠습니까? 이 파일을 사용하는 일부 콘텐츠도 삭제됩니다."
|
||||
unfollowConfirm: "{name}님을 언팔로우하시겠습니까?"
|
||||
cancelFollowRequestConfirm: "{name}(으)로의 팔로우 신청을 취소하시겠습니까?"
|
||||
rejectFollowRequestConfirm: "{name}(으)로부터의 팔로우 신청을 거부하시겠습니까?"
|
||||
exportRequested: "내보내기를 요청하였습니다. 이 작업은 시간이 걸릴 수 있습니다. 내보내기가 완료되면 \"드라이브\"에 추가됩니다."
|
||||
importRequested: "가져오기를 요청하였습니다. 이 작업에는 시간이 걸릴 수 있습니다."
|
||||
lists: "리스트"
|
||||
|
|
|
|||
|
|
@ -83,6 +83,8 @@ files: "文件"
|
|||
download: "下载"
|
||||
driveFileDeleteConfirm: "要删除「{name}」文件吗?附加此文件的帖子也会被删除。"
|
||||
unfollowConfirm: "要取消对 {name} 的关注吗?"
|
||||
cancelFollowRequestConfirm: "要取消申请关注{name}吗?"
|
||||
rejectFollowRequestConfirm: "要拒绝{name}的关注申请吗?"
|
||||
exportRequested: "导出请求已提交,这可能需要花一些时间,导出的文件将保存到网盘中。"
|
||||
importRequested: "导入请求已提交,这可能需要花一点时间。"
|
||||
lists: "列表"
|
||||
|
|
@ -2557,9 +2559,9 @@ _poll:
|
|||
deadlineTime: "时间"
|
||||
duration: "期限"
|
||||
votesCount: "{n}票"
|
||||
totalVotes: "总票数 {n}"
|
||||
totalVotes: "总计{n}票"
|
||||
vote: "投票"
|
||||
showResult: "显示结果"
|
||||
showResult: "查看结果"
|
||||
voted: "已投票"
|
||||
closed: "已截止"
|
||||
remainingDays: "{d}天{h}小时后截止"
|
||||
|
|
|
|||
|
|
@ -83,6 +83,8 @@ files: "檔案"
|
|||
download: "下載"
|
||||
driveFileDeleteConfirm: "確定要刪除檔案「{name}」嗎?使用此檔案的貼文也會跟著被刪除。"
|
||||
unfollowConfirm: "確定要取消追隨{name}嗎?"
|
||||
cancelFollowRequestConfirm: "要取消向 {name} 送出的追隨申請嗎?"
|
||||
rejectFollowRequestConfirm: "要拒絕來自 {name} 的追隨申請嗎?"
|
||||
exportRequested: "已請求匯出。這可能會花一點時間。匯出的檔案將會被放到雲端硬碟裡。"
|
||||
importRequested: "已請求匯入。這可能會花一點時間。"
|
||||
lists: "清單"
|
||||
|
|
|
|||
28
package.json
28
package.json
|
|
@ -1,12 +1,12 @@
|
|||
{
|
||||
"name": "misskey",
|
||||
"version": "2025.11.1-alpha.1",
|
||||
"version": "2025.11.1",
|
||||
"codename": "nasubi",
|
||||
"repository": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/misskey-dev/misskey.git"
|
||||
},
|
||||
"packageManager": "pnpm@10.20.0",
|
||||
"packageManager": "pnpm@10.22.0",
|
||||
"workspaces": [
|
||||
"packages/frontend-shared",
|
||||
"packages/frontend",
|
||||
|
|
@ -55,30 +55,30 @@
|
|||
},
|
||||
"dependencies": {
|
||||
"cssnano": "7.1.2",
|
||||
"esbuild": "0.25.11",
|
||||
"esbuild": "0.27.0",
|
||||
"execa": "9.6.0",
|
||||
"fast-glob": "3.3.3",
|
||||
"glob": "11.0.3",
|
||||
"glob": "13.0.0",
|
||||
"ignore-walk": "8.0.0",
|
||||
"js-yaml": "4.1.0",
|
||||
"js-yaml": "4.1.1",
|
||||
"postcss": "8.5.6",
|
||||
"tar": "7.5.2",
|
||||
"terser": "5.44.0",
|
||||
"terser": "5.44.1",
|
||||
"typescript": "5.9.3"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@eslint/js": "9.39.0",
|
||||
"@misskey-dev/eslint-plugin": "2.1.0",
|
||||
"@eslint/js": "9.39.1",
|
||||
"@misskey-dev/eslint-plugin": "2.2.0",
|
||||
"@types/js-yaml": "4.0.9",
|
||||
"@types/node": "24.9.2",
|
||||
"@typescript-eslint/eslint-plugin": "8.46.2",
|
||||
"@typescript-eslint/parser": "8.46.2",
|
||||
"@types/node": "24.10.1",
|
||||
"@typescript-eslint/eslint-plugin": "8.47.0",
|
||||
"@typescript-eslint/parser": "8.47.0",
|
||||
"cross-env": "10.1.0",
|
||||
"cypress": "15.5.0",
|
||||
"eslint": "9.39.0",
|
||||
"cypress": "15.6.0",
|
||||
"eslint": "9.39.1",
|
||||
"globals": "16.5.0",
|
||||
"ncp": "2.0.0",
|
||||
"pnpm": "10.20.0",
|
||||
"pnpm": "10.22.0",
|
||||
"start-server-and-test": "2.1.2"
|
||||
},
|
||||
"optionalDependencies": {
|
||||
|
|
|
|||
|
|
@ -70,8 +70,8 @@
|
|||
"utf-8-validate": "6.0.5"
|
||||
},
|
||||
"dependencies": {
|
||||
"@aws-sdk/client-s3": "3.933.0",
|
||||
"@aws-sdk/lib-storage": "3.933.0",
|
||||
"@aws-sdk/client-s3": "3.936.0",
|
||||
"@aws-sdk/lib-storage": "3.936.0",
|
||||
"@discordapp/twemoji": "16.0.1",
|
||||
"@fastify/accepts": "5.0.3",
|
||||
"@fastify/cookie": "11.0.2",
|
||||
|
|
@ -88,14 +88,14 @@
|
|||
"@nestjs/core": "11.1.9",
|
||||
"@nestjs/testing": "11.1.9",
|
||||
"@peertube/http-signature": "1.7.0",
|
||||
"@sentry/node": "10.25.0",
|
||||
"@sentry/profiling-node": "10.25.0",
|
||||
"@sentry/node": "10.26.0",
|
||||
"@sentry/profiling-node": "10.26.0",
|
||||
"@simplewebauthn/server": "13.2.2",
|
||||
"@sinonjs/fake-timers": "15.0.0",
|
||||
"@smithy/node-http-handler": "4.4.5",
|
||||
"@swc/cli": "0.7.8",
|
||||
"@swc/cli": "0.7.9",
|
||||
"@swc/core": "1.15.2",
|
||||
"@twemoji/parser": "17.0.1",
|
||||
"@twemoji/parser": "16.0.0",
|
||||
"@types/redis-info": "3.0.3",
|
||||
"accepts": "1.3.8",
|
||||
"ajv": "8.17.1",
|
||||
|
|
@ -114,10 +114,10 @@
|
|||
"content-disposition": "1.0.0",
|
||||
"date-fns": "4.1.0",
|
||||
"deep-email-validator": "0.1.21",
|
||||
"fastify": "5.6.1",
|
||||
"fastify": "5.6.2",
|
||||
"fastify-raw-body": "5.0.0",
|
||||
"feed": "5.1.0",
|
||||
"file-type": "21.1.0",
|
||||
"file-type": "21.1.1",
|
||||
"fluent-ffmpeg": "2.1.3",
|
||||
"form-data": "4.0.5",
|
||||
"got": "14.6.4",
|
||||
|
|
@ -161,7 +161,7 @@
|
|||
"qrcode": "1.5.4",
|
||||
"random-seed": "0.3.0",
|
||||
"ratelimiter": "3.4.1",
|
||||
"re2": "1.22.1",
|
||||
"re2": "1.22.3",
|
||||
"redis-info": "3.1.0",
|
||||
"reflect-metadata": "0.2.2",
|
||||
"rename": "1.0.4",
|
||||
|
|
@ -190,7 +190,7 @@
|
|||
"devDependencies": {
|
||||
"@jest/globals": "29.7.0",
|
||||
"@nestjs/platform-express": "11.1.9",
|
||||
"@sentry/vue": "10.25.0",
|
||||
"@sentry/vue": "10.26.0",
|
||||
"@simplewebauthn/types": "12.0.0",
|
||||
"@swc/jest": "0.2.39",
|
||||
"@types/accepts": "1.3.7",
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ function greet() {
|
|||
//#endregion
|
||||
|
||||
console.log(' Misskey is an open-source decentralized microblogging platform.');
|
||||
console.log(chalk.rgb(255, 136, 0)(' If you like Misskey, please donate to support development. https://www.patreon.com/syuilo'));
|
||||
console.log(chalk.rgb(255, 136, 0)(' If you like Misskey, please consider donating to support dev. https://misskey-hub.net/docs/donate/'));
|
||||
|
||||
console.log('');
|
||||
console.log(chalkTemplate`--- ${os.hostname()} {gray (PID: ${process.pid.toString()})} ---`);
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@ import * as fs from 'node:fs';
|
|||
import { fileURLToPath } from 'node:url';
|
||||
import { dirname } from 'node:path';
|
||||
import { Injectable } from '@nestjs/common';
|
||||
import * as nsfw from 'nsfwjs';
|
||||
import si from 'systeminformation';
|
||||
import { Mutex } from 'async-mutex';
|
||||
import fetch from 'node-fetch';
|
||||
import { bindThis } from '@/decorators.js';
|
||||
import type { NSFWJS, PredictionType } from 'nsfwjs';
|
||||
|
||||
const _filename = fileURLToPath(import.meta.url);
|
||||
const _dirname = dirname(_filename);
|
||||
|
|
@ -21,7 +21,7 @@ let isSupportedCpu: undefined | boolean = undefined;
|
|||
|
||||
@Injectable()
|
||||
export class AiService {
|
||||
private model: nsfw.NSFWJS;
|
||||
private model: NSFWJS;
|
||||
private modelLoadMutex: Mutex = new Mutex();
|
||||
|
||||
constructor(
|
||||
|
|
@ -29,7 +29,7 @@ export class AiService {
|
|||
}
|
||||
|
||||
@bindThis
|
||||
public async detectSensitive(source: string | Buffer): Promise<nsfw.PredictionType[] | null> {
|
||||
public async detectSensitive(source: string | Buffer): Promise<PredictionType[] | null> {
|
||||
try {
|
||||
if (isSupportedCpu === undefined) {
|
||||
isSupportedCpu = await this.computeIsSupportedCpu();
|
||||
|
|
@ -44,6 +44,7 @@ export class AiService {
|
|||
tf.env().global.fetch = fetch;
|
||||
|
||||
if (this.model == null) {
|
||||
const nsfw = await import('nsfwjs');
|
||||
await this.modelLoadMutex.runExclusive(async () => {
|
||||
if (this.model == null) {
|
||||
this.model = await nsfw.load(`file://${_dirname}/../../nsfw-model/`, { size: 299 });
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@
|
|||
|
||||
import { Inject, Injectable } from '@nestjs/common';
|
||||
import { Endpoint } from '@/server/api/endpoint-base.js';
|
||||
import { QueryService } from '@/core/QueryService.js';
|
||||
import type { ClipFavoritesRepository } from '@/models/_.js';
|
||||
import { DI } from '@/di-symbols.js';
|
||||
import { ClipEntityService } from '@/core/entities/ClipEntityService.js';
|
||||
|
|
@ -31,11 +30,6 @@ export const meta = {
|
|||
export const paramDef = {
|
||||
type: 'object',
|
||||
properties: {
|
||||
limit: { type: 'integer', minimum: 1, maximum: 100, default: 10 },
|
||||
sinceId: { type: 'string', format: 'misskey:id' },
|
||||
untilId: { type: 'string', format: 'misskey:id' },
|
||||
sinceDate: { type: 'integer' },
|
||||
untilDate: { type: 'integer' },
|
||||
},
|
||||
required: [],
|
||||
} as const;
|
||||
|
|
@ -46,16 +40,14 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
|
|||
@Inject(DI.clipFavoritesRepository)
|
||||
private clipFavoritesRepository: ClipFavoritesRepository,
|
||||
|
||||
private queryService: QueryService,
|
||||
private clipEntityService: ClipEntityService,
|
||||
) {
|
||||
super(meta, paramDef, async (ps, me) => {
|
||||
const query = this.queryService.makePaginationQuery(this.clipFavoritesRepository.createQueryBuilder('favorite'), ps.sinceId, ps.untilId, ps.sinceDate, ps.untilDate)
|
||||
const query = this.clipFavoritesRepository.createQueryBuilder('favorite')
|
||||
.andWhere('favorite.userId = :meId', { meId: me.id })
|
||||
.leftJoinAndSelect('favorite.clip', 'clip');
|
||||
|
||||
const favorites = await query
|
||||
.limit(ps.limit)
|
||||
.getMany();
|
||||
|
||||
return this.clipEntityService.packMany(favorites.map(x => x.clip!), me);
|
||||
|
|
|
|||
|
|
@ -295,8 +295,20 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
|
|||
if (ps.chatScope !== undefined) updates.chatScope = ps.chatScope;
|
||||
|
||||
function checkMuteWordCount(mutedWords: (string[] | string)[], limit: number) {
|
||||
// TODO: ちゃんと数える
|
||||
const length = JSON.stringify(mutedWords).length;
|
||||
const count = (arr: (string[] | string)[]) => {
|
||||
let length = 0;
|
||||
for (const item of arr) {
|
||||
if (typeof item === 'string') {
|
||||
length += item.length;
|
||||
} else if (Array.isArray(item)) {
|
||||
for (const subItem of item) {
|
||||
length += subItem.length;
|
||||
}
|
||||
}
|
||||
}
|
||||
return length;
|
||||
};
|
||||
const length = count(mutedWords);
|
||||
if (length > limit) {
|
||||
throw new ApiError(meta.errors.tooManyMutedWords);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -135,6 +135,18 @@ export const meta = {
|
|||
code: 'CANNOT_RENOTE_TO_EXTERNAL',
|
||||
id: 'ed1952ac-2d26-4957-8b30-2deda76bedf7',
|
||||
},
|
||||
|
||||
scheduledAtRequired: {
|
||||
message: 'scheduledAt is required when isActuallyScheduled is true.',
|
||||
code: 'SCHEDULED_AT_REQUIRED',
|
||||
id: '15e28a55-e74c-4d65-89b7-8880cdaaa87d',
|
||||
},
|
||||
|
||||
scheduledAtMustBeInFuture: {
|
||||
message: 'scheduledAt must be in the future.',
|
||||
code: 'SCHEDULED_AT_MUST_BE_IN_FUTURE',
|
||||
id: 'e4bed6c9-017e-4934-aed0-01c22cc60ec1',
|
||||
},
|
||||
},
|
||||
|
||||
limit: {
|
||||
|
|
@ -252,6 +264,10 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
|
|||
throw new ApiError(meta.errors.cannotReplyToSpecifiedVisibilityNoteWithExtendedVisibility);
|
||||
case 'c3275f19-4558-4c59-83e1-4f684b5fab66':
|
||||
throw new ApiError(meta.errors.tooManyScheduledNotes);
|
||||
case '94a89a43-3591-400a-9c17-dd166e71fdfa':
|
||||
throw new ApiError(meta.errors.scheduledAtRequired);
|
||||
case 'b34d0c1b-996f-4e34-a428-c636d98df457':
|
||||
throw new ApiError(meta.errors.scheduledAtMustBeInFuture);
|
||||
default:
|
||||
throw err;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -165,6 +165,18 @@ export const meta = {
|
|||
code: 'TOO_MANY_SCHEDULED_NOTES',
|
||||
id: '02f5df79-08ae-4a33-8524-f1503c8f6212',
|
||||
},
|
||||
|
||||
scheduledAtRequired: {
|
||||
message: 'scheduledAt is required when isActuallyScheduled is true.',
|
||||
code: 'SCHEDULED_AT_REQUIRED',
|
||||
id: 'fe9737d5-cc41-498c-af9d-149207307530',
|
||||
},
|
||||
|
||||
scheduledAtMustBeInFuture: {
|
||||
message: 'scheduledAt must be in the future.',
|
||||
code: 'SCHEDULED_AT_MUST_BE_IN_FUTURE',
|
||||
id: 'ed1a6673-d0d1-4364-aaae-9bf3f139cbc5',
|
||||
},
|
||||
},
|
||||
|
||||
limit: {
|
||||
|
|
@ -295,6 +307,10 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
|
|||
throw new ApiError(meta.errors.containsTooManyMentions);
|
||||
case 'bacdf856-5c51-4159-b88a-804fa5103be5':
|
||||
throw new ApiError(meta.errors.tooManyScheduledNotes);
|
||||
case '94a89a43-3591-400a-9c17-dd166e71fdfa':
|
||||
throw new ApiError(meta.errors.scheduledAtRequired);
|
||||
case 'b34d0c1b-996f-4e34-a428-c636d98df457':
|
||||
throw new ApiError(meta.errors.scheduledAtMustBeInFuture);
|
||||
default:
|
||||
throw err;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@ import { AnnouncementEntityService } from '@/core/entities/AnnouncementEntitySer
|
|||
import { FeedService } from './FeedService.js';
|
||||
import { UrlPreviewService } from './UrlPreviewService.js';
|
||||
import { ClientLoggerService } from './ClientLoggerService.js';
|
||||
import type { FastifyInstance, FastifyPluginOptions, FastifyReply } from 'fastify';
|
||||
import type { FastifyError, FastifyInstance, FastifyPluginOptions, FastifyReply } from 'fastify';
|
||||
|
||||
const _filename = fileURLToPath(import.meta.url);
|
||||
const _dirname = dirname(_filename);
|
||||
|
|
@ -918,7 +918,7 @@ export class ClientServerService {
|
|||
return await renderBase(reply);
|
||||
});
|
||||
|
||||
fastify.setErrorHandler(async (error, request, reply) => {
|
||||
fastify.setErrorHandler<FastifyError>(async (error, request, reply) => {
|
||||
const errId = randomUUID();
|
||||
this.clientLoggerService.logger.error(`Internal error occurred in ${request.routeOptions.url}: ${error.message}`, {
|
||||
path: request.routeOptions.url,
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ html
|
|||
meta(name='theme-color-orig' content= themeColor || '#86b300')
|
||||
meta(property='og:site_name' content= instanceName || 'Misskey')
|
||||
meta(property='instance_url' content= instanceUrl)
|
||||
meta(name='viewport' content='width=device-width, initial-scale=1')
|
||||
meta(name='viewport' content='width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=no, viewport-fit=cover')
|
||||
meta(name='format-detection' content='telephone=no,date=no,address=no,email=no,url=no')
|
||||
link(rel='icon' href= icon || '/favicon.ico')
|
||||
link(rel='apple-touch-icon' href= appleTouchIcon || '/apple-touch-icon.png')
|
||||
|
|
|
|||
|
|
@ -95,7 +95,7 @@ services:
|
|||
retries: 20
|
||||
|
||||
db:
|
||||
image: postgres:15-alpine
|
||||
image: postgres:18-alpine
|
||||
env_file:
|
||||
- ./.config/docker.env
|
||||
volumes:
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ services:
|
|||
- "127.0.0.1:56312:6379"
|
||||
|
||||
dbtest:
|
||||
image: postgres:15
|
||||
image: postgres:18
|
||||
ports:
|
||||
- "127.0.0.1:54312:5432"
|
||||
environment:
|
||||
|
|
|
|||
|
|
@ -506,10 +506,10 @@ describe('クリップ', () => {
|
|||
});
|
||||
};
|
||||
|
||||
const myFavorites = async (parameters: Misskey.entities.ClipsMyFavoritesRequest, request: Partial<ApiRequest<'clips/my-favorites'>> = {}): Promise<Misskey.entities.Clip[]> => {
|
||||
const myFavorites = async (request: Partial<ApiRequest<'clips/my-favorites'>> = {}): Promise<Misskey.entities.Clip[]> => {
|
||||
return successfulApiCall({
|
||||
endpoint: 'clips/my-favorites',
|
||||
parameters,
|
||||
parameters: {},
|
||||
user: alice,
|
||||
...request,
|
||||
});
|
||||
|
|
@ -562,9 +562,8 @@ describe('クリップ', () => {
|
|||
await favorite({ clipId: clip.id });
|
||||
}
|
||||
|
||||
const favorited = await myFavorites({
|
||||
limit: 30,
|
||||
});
|
||||
// pagenationはない。全部一気にとれる。
|
||||
const favorited = await myFavorites();
|
||||
assert.strictEqual(favorited.length, clips.length);
|
||||
for (const clip of favorited) {
|
||||
assert.strictEqual(clip.favoritedCount, 1);
|
||||
|
|
@ -618,7 +617,7 @@ describe('クリップ', () => {
|
|||
const clip = await show({ clipId: aliceClip.id });
|
||||
assert.strictEqual(clip.favoritedCount, 0);
|
||||
assert.strictEqual(clip.isFavorited, false);
|
||||
assert.deepStrictEqual(await myFavorites({}), []);
|
||||
assert.deepStrictEqual(await myFavorites(), []);
|
||||
});
|
||||
|
||||
test.each([
|
||||
|
|
@ -652,13 +651,13 @@ describe('クリップ', () => {
|
|||
|
||||
test('を取得できる。', async () => {
|
||||
await favorite({ clipId: aliceClip.id });
|
||||
const favorited = await myFavorites({});
|
||||
const favorited = await myFavorites();
|
||||
assert.deepStrictEqual(favorited, [await show({ clipId: aliceClip.id })]);
|
||||
});
|
||||
|
||||
test('を取得したとき他人のお気に入りは含まない。', async () => {
|
||||
await favorite({ clipId: aliceClip.id });
|
||||
const favorited = await myFavorites({}, { user: bob });
|
||||
const favorited = await myFavorites({ user: bob });
|
||||
assert.deepStrictEqual(favorited, []);
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -11,15 +11,15 @@
|
|||
},
|
||||
"devDependencies": {
|
||||
"@types/estree": "1.0.8",
|
||||
"@types/node": "24.9.2",
|
||||
"@typescript-eslint/eslint-plugin": "8.46.2",
|
||||
"@typescript-eslint/parser": "8.46.2",
|
||||
"rollup": "4.52.5",
|
||||
"@types/node": "24.10.1",
|
||||
"@typescript-eslint/eslint-plugin": "8.47.0",
|
||||
"@typescript-eslint/parser": "8.47.0",
|
||||
"rollup": "4.53.3",
|
||||
"typescript": "5.9.3"
|
||||
},
|
||||
"dependencies": {
|
||||
"estree-walker": "3.0.3",
|
||||
"magic-string": "0.30.21",
|
||||
"vite": "7.1.11"
|
||||
"vite": "7.2.2"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,8 +15,8 @@
|
|||
"@rollup/plugin-replace": "6.0.3",
|
||||
"@rollup/pluginutils": "5.3.0",
|
||||
"@twemoji/parser": "16.0.0",
|
||||
"@vitejs/plugin-vue": "6.0.1",
|
||||
"@vue/compiler-sfc": "3.5.22",
|
||||
"@vitejs/plugin-vue": "6.0.2",
|
||||
"@vue/compiler-sfc": "3.5.24",
|
||||
"astring": "1.9.0",
|
||||
"buraha": "0.0.1",
|
||||
"estree-walker": "3.0.3",
|
||||
|
|
@ -26,16 +26,16 @@
|
|||
"mfm-js": "0.25.0",
|
||||
"misskey-js": "workspace:*",
|
||||
"punycode.js": "2.3.1",
|
||||
"rollup": "4.52.5",
|
||||
"sass": "1.93.3",
|
||||
"shiki": "3.14.0",
|
||||
"rollup": "4.53.3",
|
||||
"sass": "1.94.1",
|
||||
"shiki": "3.15.0",
|
||||
"tinycolor2": "1.6.0",
|
||||
"tsc-alias": "1.8.16",
|
||||
"tsconfig-paths": "4.2.0",
|
||||
"typescript": "5.9.3",
|
||||
"uuid": "13.0.0",
|
||||
"vite": "7.1.11",
|
||||
"vue": "3.5.22"
|
||||
"vite": "7.2.2",
|
||||
"vue": "3.5.24"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@misskey-dev/summaly": "5.2.5",
|
||||
|
|
@ -43,14 +43,14 @@
|
|||
"@testing-library/vue": "8.1.0",
|
||||
"@types/estree": "1.0.8",
|
||||
"@types/micromatch": "4.0.10",
|
||||
"@types/node": "24.9.2",
|
||||
"@types/node": "24.10.1",
|
||||
"@types/punycode.js": "npm:@types/punycode@2.1.4",
|
||||
"@types/tinycolor2": "1.4.6",
|
||||
"@types/ws": "8.18.1",
|
||||
"@typescript-eslint/eslint-plugin": "8.46.2",
|
||||
"@typescript-eslint/parser": "8.46.2",
|
||||
"@typescript-eslint/eslint-plugin": "8.47.0",
|
||||
"@typescript-eslint/parser": "8.47.0",
|
||||
"@vitest/coverage-v8": "3.2.4",
|
||||
"@vue/runtime-core": "3.5.22",
|
||||
"@vue/runtime-core": "3.5.24",
|
||||
"acorn": "8.15.0",
|
||||
"cross-env": "10.1.0",
|
||||
"eslint-plugin-import": "2.32.0",
|
||||
|
|
@ -59,14 +59,14 @@
|
|||
"happy-dom": "20.0.10",
|
||||
"intersection-observer": "0.12.2",
|
||||
"micromatch": "4.0.8",
|
||||
"msw": "2.11.6",
|
||||
"nodemon": "3.1.10",
|
||||
"msw": "2.12.2",
|
||||
"nodemon": "3.1.11",
|
||||
"prettier": "3.6.2",
|
||||
"start-server-and-test": "2.1.2",
|
||||
"tsx": "4.20.6",
|
||||
"vite-plugin-turbosnap": "1.0.3",
|
||||
"vue-component-type-helpers": "3.1.2",
|
||||
"vue-component-type-helpers": "3.1.4",
|
||||
"vue-eslint-parser": "10.2.0",
|
||||
"vue-tsc": "3.1.2"
|
||||
"vue-tsc": "3.1.4"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,12 +21,12 @@
|
|||
"lint": "pnpm typecheck && pnpm eslint"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/node": "24.9.2",
|
||||
"@typescript-eslint/eslint-plugin": "8.46.2",
|
||||
"@typescript-eslint/parser": "8.46.2",
|
||||
"esbuild": "0.25.11",
|
||||
"@types/node": "24.10.1",
|
||||
"@typescript-eslint/eslint-plugin": "8.47.0",
|
||||
"@typescript-eslint/parser": "8.47.0",
|
||||
"esbuild": "0.27.0",
|
||||
"eslint-plugin-vue": "10.5.1",
|
||||
"nodemon": "3.1.10",
|
||||
"nodemon": "3.1.11",
|
||||
"typescript": "5.9.3",
|
||||
"vue-eslint-parser": "10.2.0"
|
||||
},
|
||||
|
|
@ -35,6 +35,6 @@
|
|||
],
|
||||
"dependencies": {
|
||||
"misskey-js": "workspace:*",
|
||||
"vue": "3.5.22"
|
||||
"vue": "3.5.24"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -24,12 +24,12 @@
|
|||
"@rollup/plugin-json": "6.1.0",
|
||||
"@rollup/plugin-replace": "6.0.3",
|
||||
"@rollup/pluginutils": "5.3.0",
|
||||
"@sentry/vue": "10.22.0",
|
||||
"@syuilo/aiscript": "1.1.2",
|
||||
"@sentry/vue": "10.26.0",
|
||||
"@syuilo/aiscript": "1.2.0",
|
||||
"@syuilo/aiscript-0-19-0": "npm:@syuilo/aiscript@^0.19.0",
|
||||
"@twemoji/parser": "16.0.0",
|
||||
"@vitejs/plugin-vue": "6.0.1",
|
||||
"@vue/compiler-sfc": "3.5.22",
|
||||
"@vitejs/plugin-vue": "6.0.2",
|
||||
"@vue/compiler-sfc": "3.5.24",
|
||||
"aiscript-vscode": "github:aiscript-dev/aiscript-vscode#v0.1.15",
|
||||
"analytics": "0.8.19",
|
||||
"astring": "1.9.0",
|
||||
|
|
@ -41,7 +41,7 @@
|
|||
"chartjs-chart-matrix": "3.0.0",
|
||||
"chartjs-plugin-gradient": "0.6.1",
|
||||
"chartjs-plugin-zoom": "2.2.0",
|
||||
"chromatic": "13.3.3",
|
||||
"chromatic": "13.3.4",
|
||||
"compare-versions": "6.1.1",
|
||||
"cropperjs": "2.1.0",
|
||||
"date-fns": "4.1.0",
|
||||
|
|
@ -58,7 +58,7 @@
|
|||
"json5": "2.2.3",
|
||||
"magic-string": "0.30.21",
|
||||
"matter-js": "0.20.0",
|
||||
"mediabunny": "1.24.2",
|
||||
"mediabunny": "1.25.0",
|
||||
"mfm-js": "0.25.0",
|
||||
"misskey-bubble-game": "workspace:*",
|
||||
"misskey-js": "workspace:*",
|
||||
|
|
@ -67,21 +67,21 @@
|
|||
"punycode.js": "2.3.1",
|
||||
"qr-code-styling": "1.9.2",
|
||||
"qr-scanner": "1.4.2",
|
||||
"rollup": "4.52.5",
|
||||
"rollup": "4.53.3",
|
||||
"sanitize-html": "2.17.0",
|
||||
"sass": "1.93.3",
|
||||
"shiki": "3.14.0",
|
||||
"sass": "1.94.1",
|
||||
"shiki": "3.15.0",
|
||||
"strict-event-emitter-types": "2.0.0",
|
||||
"textarea-caret": "3.1.0",
|
||||
"three": "0.181.0",
|
||||
"three": "0.181.2",
|
||||
"throttle-debounce": "5.0.2",
|
||||
"tinycolor2": "1.6.0",
|
||||
"tsc-alias": "1.8.16",
|
||||
"tsconfig-paths": "4.2.0",
|
||||
"typescript": "5.9.3",
|
||||
"v-code-diff": "1.13.1",
|
||||
"vite": "7.1.11",
|
||||
"vue": "3.5.22",
|
||||
"vite": "7.2.2",
|
||||
"vue": "3.5.24",
|
||||
"vuedraggable": "next",
|
||||
"wanakana": "5.3.1"
|
||||
},
|
||||
|
|
@ -110,21 +110,21 @@
|
|||
"@types/estree": "1.0.8",
|
||||
"@types/matter-js": "0.20.2",
|
||||
"@types/micromatch": "4.0.10",
|
||||
"@types/node": "24.9.2",
|
||||
"@types/node": "24.10.1",
|
||||
"@types/punycode.js": "npm:@types/punycode@2.1.4",
|
||||
"@types/sanitize-html": "2.16.0",
|
||||
"@types/seedrandom": "3.0.8",
|
||||
"@types/throttle-debounce": "5.0.2",
|
||||
"@types/tinycolor2": "1.4.6",
|
||||
"@types/ws": "8.18.1",
|
||||
"@typescript-eslint/eslint-plugin": "8.46.2",
|
||||
"@typescript-eslint/parser": "8.46.2",
|
||||
"@typescript-eslint/eslint-plugin": "8.47.0",
|
||||
"@typescript-eslint/parser": "8.47.0",
|
||||
"@vitest/coverage-v8": "3.2.4",
|
||||
"@vue/compiler-core": "3.5.22",
|
||||
"@vue/runtime-core": "3.5.22",
|
||||
"@vue/compiler-core": "3.5.24",
|
||||
"@vue/runtime-core": "3.5.24",
|
||||
"acorn": "8.15.0",
|
||||
"cross-env": "10.1.0",
|
||||
"cypress": "15.5.0",
|
||||
"cypress": "15.6.0",
|
||||
"eslint-plugin-import": "2.32.0",
|
||||
"eslint-plugin-vue": "10.5.1",
|
||||
"fast-glob": "3.3.3",
|
||||
|
|
@ -132,9 +132,9 @@
|
|||
"intersection-observer": "0.12.2",
|
||||
"micromatch": "4.0.8",
|
||||
"minimatch": "10.1.1",
|
||||
"msw": "2.11.6",
|
||||
"msw": "2.12.2",
|
||||
"msw-storybook-addon": "2.0.6",
|
||||
"nodemon": "3.1.10",
|
||||
"nodemon": "3.1.11",
|
||||
"prettier": "3.6.2",
|
||||
"react": "19.2.0",
|
||||
"react-dom": "19.2.0",
|
||||
|
|
@ -147,8 +147,8 @@
|
|||
"vite-plugin-turbosnap": "1.0.3",
|
||||
"vitest": "3.2.4",
|
||||
"vitest-fetch-mock": "0.4.5",
|
||||
"vue-component-type-helpers": "3.1.2",
|
||||
"vue-component-type-helpers": "3.1.4",
|
||||
"vue-eslint-parser": "10.2.0",
|
||||
"vue-tsc": "3.1.2"
|
||||
"vue-tsc": "3.1.4"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -40,29 +40,77 @@ export function createAiScriptEnv(opts: { storageKey: string, token?: string })
|
|||
CUSTOM_EMOJIS: utils.jsToVal(customEmojis.value),
|
||||
LOCALE: values.STR(lang),
|
||||
SERVER_URL: values.STR(url),
|
||||
'Mk:dialog': values.FN_NATIVE(async ([title, text, type]) => {
|
||||
utils.assertString(title);
|
||||
utils.assertString(text);
|
||||
if (type != null) {
|
||||
assertStringAndIsIn(type, DIALOG_TYPES);
|
||||
'Mk:dialog': values.FN_NATIVE(async ([_title, _text, _type]) => {
|
||||
let title: string | undefined = undefined;
|
||||
let text: string | undefined = undefined;
|
||||
let type: typeof DIALOG_TYPES[number] = 'info';
|
||||
|
||||
if (_title != null) {
|
||||
if (utils.isString(_title)) {
|
||||
title = _title.value;
|
||||
} else {
|
||||
utils.assertNull(_title);
|
||||
}
|
||||
}
|
||||
|
||||
if (_text != null) {
|
||||
if (utils.isString(_text)) {
|
||||
text = _text.value;
|
||||
} else {
|
||||
utils.assertNull(_text);
|
||||
}
|
||||
}
|
||||
|
||||
if (_type != null) {
|
||||
if (utils.isString(_type)) {
|
||||
assertStringAndIsIn(_type, DIALOG_TYPES);
|
||||
type = _type.value;
|
||||
} else {
|
||||
utils.assertNull(_type);
|
||||
}
|
||||
}
|
||||
|
||||
await os.alert({
|
||||
type: type ? type.value : 'info',
|
||||
title: title.value,
|
||||
text: text.value,
|
||||
type,
|
||||
title,
|
||||
text,
|
||||
});
|
||||
return values.NULL;
|
||||
}),
|
||||
'Mk:confirm': values.FN_NATIVE(async ([title, text, type]) => {
|
||||
utils.assertString(title);
|
||||
utils.assertString(text);
|
||||
if (type != null) {
|
||||
assertStringAndIsIn(type, DIALOG_TYPES);
|
||||
'Mk:confirm': values.FN_NATIVE(async ([_title, _text, _type]) => {
|
||||
let title: string | undefined = undefined;
|
||||
let text: string | undefined = undefined;
|
||||
let type: typeof DIALOG_TYPES[number] = 'question';
|
||||
|
||||
if (_title != null) {
|
||||
if (utils.isString(_title)) {
|
||||
title = _title.value;
|
||||
} else {
|
||||
utils.assertNull(_title);
|
||||
}
|
||||
}
|
||||
|
||||
if (_text != null) {
|
||||
if (utils.isString(_text)) {
|
||||
text = _text.value;
|
||||
} else {
|
||||
utils.assertNull(_text);
|
||||
}
|
||||
}
|
||||
|
||||
if (_type != null) {
|
||||
if (utils.isString(_type)) {
|
||||
assertStringAndIsIn(_type, DIALOG_TYPES);
|
||||
type = _type.value;
|
||||
} else {
|
||||
utils.assertNull(_type);
|
||||
}
|
||||
}
|
||||
|
||||
const confirm = await os.confirm({
|
||||
type: type ? type.value : 'question',
|
||||
title: title.value,
|
||||
text: text.value,
|
||||
type,
|
||||
title,
|
||||
text,
|
||||
});
|
||||
return confirm.canceled ? values.FALSE : values.TRUE;
|
||||
}),
|
||||
|
|
@ -76,15 +124,23 @@ export function createAiScriptEnv(opts: { storageKey: string, token?: string })
|
|||
if (ep.value.includes('://') || ep.value.includes('..')) {
|
||||
throw new errors.AiScriptRuntimeError('invalid endpoint');
|
||||
}
|
||||
if (token) {
|
||||
|
||||
let actualToken: string | null = null;
|
||||
if (token != null && !utils.isNull(token)) {
|
||||
utils.assertString(token);
|
||||
// バグがあればundefinedもあり得るため念のため
|
||||
if (typeof token.value !== 'string') throw new Error('invalid token');
|
||||
if (typeof token.value !== 'string') throw new errors.AiScriptRuntimeError('invalid token');
|
||||
actualToken = token.value;
|
||||
}
|
||||
const actualToken: string | null = token?.value ?? opts.token ?? null;
|
||||
|
||||
if (actualToken == null) {
|
||||
actualToken = opts.token ?? null;
|
||||
}
|
||||
|
||||
if (param == null) {
|
||||
throw new errors.AiScriptRuntimeError('expected param');
|
||||
}
|
||||
|
||||
utils.assertObject(param);
|
||||
return misskeyApi(ep.value as keyof Misskey.Endpoints, utils.valToJs(param) as object, actualToken).then(res => {
|
||||
return utils.jsToVal(res);
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
* SPDX-License-Identifier: AGPL-3.0-only
|
||||
*/
|
||||
|
||||
import { computed, watch, version as vueVersion } from 'vue';
|
||||
import { watch, version as vueVersion } from 'vue';
|
||||
import { compareVersions } from 'compare-versions';
|
||||
import { version, lang, apiUrl, isSafeMode } from '@@/js/config.js';
|
||||
import defaultLightTheme from '@@/themes/l-light.json5';
|
||||
|
|
@ -15,11 +15,11 @@ import directives from '@/directives/index.js';
|
|||
import components from '@/components/index.js';
|
||||
import { applyTheme } from '@/theme.js';
|
||||
import { isDeviceDarkmode } from '@/utility/is-device-darkmode.js';
|
||||
import { updateI18n, i18n } from '@/i18n.js';
|
||||
import { i18n } from '@/i18n.js';
|
||||
import { refreshCurrentAccount, login } from '@/accounts.js';
|
||||
import { store } from '@/store.js';
|
||||
import { fetchInstance, instance } from '@/instance.js';
|
||||
import { deviceKind, updateDeviceKind } from '@/utility/device-kind.js';
|
||||
import { updateDeviceKind } from '@/utility/device-kind.js';
|
||||
import { reloadChannel } from '@/utility/unison-reload.js';
|
||||
import { getUrlWithoutLoginId } from '@/utility/login-id.js';
|
||||
import { getAccountFromId } from '@/utility/get-account-from-id.js';
|
||||
|
|
@ -109,13 +109,6 @@ export async function common(createVue: () => Promise<App<Element>>) {
|
|||
else window.location.reload();
|
||||
});
|
||||
|
||||
// If mobile, insert the viewport meta tag
|
||||
if (['smartphone', 'tablet'].includes(deviceKind)) {
|
||||
const viewport = window.document.getElementsByName('viewport').item(0);
|
||||
viewport.setAttribute('content',
|
||||
`${viewport.getAttribute('content')}, minimum-scale=1, maximum-scale=1, user-scalable=no, viewport-fit=cover`);
|
||||
}
|
||||
|
||||
//#region Set lang attr
|
||||
const html = window.document.documentElement;
|
||||
html.setAttribute('lang', lang);
|
||||
|
|
@ -160,8 +153,15 @@ export async function common(createVue: () => Promise<App<Element>>) {
|
|||
});
|
||||
//#endregion
|
||||
|
||||
if (!isSafeMode) {
|
||||
// TODO: instance.defaultLightTheme/instance.defaultDarkThemeが不正な形式だった場合のケア
|
||||
if (prefer.s.lightTheme == null && instance.defaultLightTheme != null) prefer.commit('lightTheme', JSON.parse(instance.defaultLightTheme));
|
||||
if (prefer.s.darkTheme == null && instance.defaultDarkTheme != null) prefer.commit('darkTheme', JSON.parse(instance.defaultDarkTheme));
|
||||
}
|
||||
|
||||
// NOTE: この処理は必ずクライアント更新チェック処理より後に来ること(テーマ再構築のため)
|
||||
// NOTE: この処理は必ずダークモード判定処理より後に来ること(初回のテーマ適用のため)
|
||||
// NOTE: この処理は必ずサーバーテーマ適用処理より後に来ること(二重applyTheme発火を防ぐため)
|
||||
// see: https://github.com/misskey-dev/misskey/issues/16562
|
||||
watch(store.r.darkMode, (darkMode) => {
|
||||
const theme = (() => {
|
||||
|
|
@ -178,26 +178,17 @@ export async function common(createVue: () => Promise<App<Element>>) {
|
|||
window.document.documentElement.dataset.colorScheme = store.s.darkMode ? 'dark' : 'light';
|
||||
|
||||
if (!isSafeMode) {
|
||||
const darkTheme = prefer.model('darkTheme');
|
||||
const lightTheme = prefer.model('lightTheme');
|
||||
|
||||
watch(darkTheme, (theme) => {
|
||||
watch(prefer.r.darkTheme, (theme) => {
|
||||
if (store.s.darkMode) {
|
||||
applyTheme(theme ?? defaultDarkTheme);
|
||||
}
|
||||
});
|
||||
|
||||
watch(lightTheme, (theme) => {
|
||||
watch(prefer.r.lightTheme, (theme) => {
|
||||
if (!store.s.darkMode) {
|
||||
applyTheme(theme ?? defaultLightTheme);
|
||||
}
|
||||
});
|
||||
|
||||
fetchInstanceMetaPromise.then(() => {
|
||||
// TODO: instance.defaultLightTheme/instance.defaultDarkThemeが不正な形式だった場合のケア
|
||||
if (prefer.s.lightTheme == null && instance.defaultLightTheme != null) prefer.commit('lightTheme', JSON.parse(instance.defaultLightTheme));
|
||||
if (prefer.s.darkTheme == null && instance.defaultDarkTheme != null) prefer.commit('darkTheme', JSON.parse(instance.defaultDarkTheme));
|
||||
});
|
||||
}
|
||||
|
||||
watch(prefer.r.overridedDeviceKind, (kind) => {
|
||||
|
|
|
|||
|
|
@ -102,6 +102,21 @@ async function onClick() {
|
|||
await misskeyApi('following/delete', {
|
||||
userId: props.user.id,
|
||||
});
|
||||
} else if (hasPendingFollowRequestFromYou.value) {
|
||||
const { canceled } = await os.confirm({
|
||||
type: 'question',
|
||||
text: i18n.tsx.cancelFollowRequestConfirm({ name: props.user.name || props.user.username }),
|
||||
});
|
||||
|
||||
if (canceled) {
|
||||
wait.value = false;
|
||||
return;
|
||||
}
|
||||
|
||||
await misskeyApi('following/requests/cancel', {
|
||||
userId: props.user.id,
|
||||
});
|
||||
hasPendingFollowRequestFromYou.value = false;
|
||||
} else {
|
||||
if (prefer.s.alwaysConfirmFollow) {
|
||||
const { canceled } = await os.confirm({
|
||||
|
|
@ -115,12 +130,6 @@ async function onClick() {
|
|||
}
|
||||
}
|
||||
|
||||
if (hasPendingFollowRequestFromYou.value) {
|
||||
await misskeyApi('following/requests/cancel', {
|
||||
userId: props.user.id,
|
||||
});
|
||||
hasPendingFollowRequestFromYou.value = false;
|
||||
} else {
|
||||
await misskeyApi('following/create', {
|
||||
userId: props.user.id,
|
||||
withReplies: prefer.s.defaultFollowWithReplies,
|
||||
|
|
@ -151,7 +160,6 @@ async function onClick() {
|
|||
claimAchievement('following300');
|
||||
}
|
||||
}
|
||||
}
|
||||
} catch (err) {
|
||||
console.error(err);
|
||||
} finally {
|
||||
|
|
|
|||
|
|
@ -63,14 +63,28 @@ function accept(user: Misskey.entities.UserLite) {
|
|||
});
|
||||
}
|
||||
|
||||
function reject(user: Misskey.entities.UserLite) {
|
||||
os.apiWithDialog('following/requests/reject', { userId: user.id }).then(() => {
|
||||
async function reject(user: Misskey.entities.UserLite) {
|
||||
const { canceled } = await os.confirm({
|
||||
type: 'question',
|
||||
text: i18n.tsx.rejectFollowRequestConfirm({ name: user.name || user.username }),
|
||||
});
|
||||
|
||||
if (canceled) return;
|
||||
|
||||
await os.apiWithDialog('following/requests/reject', { userId: user.id }).then(() => {
|
||||
paginator.reload();
|
||||
});
|
||||
}
|
||||
|
||||
function cancel(user: Misskey.entities.UserLite) {
|
||||
os.apiWithDialog('following/requests/cancel', { userId: user.id }).then(() => {
|
||||
async function cancel(user: Misskey.entities.UserLite) {
|
||||
const { canceled } = await os.confirm({
|
||||
type: 'question',
|
||||
text: i18n.tsx.cancelFollowRequestConfirm({ name: user.name || user.username }),
|
||||
});
|
||||
|
||||
if (canceled) return;
|
||||
|
||||
await os.apiWithDialog('following/requests/cancel', { userId: user.id }).then(() => {
|
||||
paginator.reload();
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -43,6 +43,8 @@ const paginator = markRaw(new Paginator('clips/list', {
|
|||
}));
|
||||
|
||||
const favoritesPaginator = markRaw(new Paginator('clips/my-favorites', {
|
||||
// ページネーションに対応していない
|
||||
noPaging: true,
|
||||
}));
|
||||
|
||||
async function create() {
|
||||
|
|
|
|||
|
|
@ -234,7 +234,7 @@ export const PREF_DEF = definePreferences({
|
|||
default: false,
|
||||
},
|
||||
disableShowingAnimatedImages: {
|
||||
default: prefersReducedMotion,
|
||||
default: false,
|
||||
},
|
||||
emojiStyle: {
|
||||
default: 'twemoji', // twemoji / fluentEmoji / native
|
||||
|
|
|
|||
|
|
@ -158,6 +158,8 @@ export function applyTheme(theme: Theme, persist = true) {
|
|||
// 様々な理由により startViewTransition は失敗することがある
|
||||
// ref. https://github.com/misskey-dev/misskey/issues/16562
|
||||
|
||||
// FIXME: viewTransitonエラーはtry~catch貫通してそうな気配がする
|
||||
|
||||
console.error(err);
|
||||
|
||||
window.document.documentElement.classList.remove('_themeChanging_');
|
||||
|
|
|
|||
|
|
@ -4,40 +4,40 @@ SPDX-License-Identifier: AGPL-3.0-only
|
|||
-->
|
||||
|
||||
<template>
|
||||
<div class="azykntjl">
|
||||
<div class="body">
|
||||
<div class="left">
|
||||
<button v-click-anime class="item _button instance" @click="openInstanceMenu">
|
||||
<img :src="instance.iconUrl ?? '/favicon.ico'" draggable="false"/>
|
||||
<div :class="[$style.root, acrylic ? $style.acrylic : null]">
|
||||
<div :class="$style.body">
|
||||
<div :class="$style.left">
|
||||
<button v-click-anime :class="[$style.item, $style.instance]" class="_button" @click="openInstanceMenu">
|
||||
<img :class="$style.instanceIcon" :src="instance.iconUrl ?? '/favicon.ico'" draggable="false"/>
|
||||
</button>
|
||||
<MkA v-click-anime v-tooltip="i18n.ts.timeline" class="item index" activeClass="active" to="/" exact>
|
||||
<i class="ti ti-home ti-fw"></i>
|
||||
<MkA v-click-anime v-tooltip="i18n.ts.timeline" :class="$style.item" activeClass="active" to="/" exact>
|
||||
<i :class="$style.itemIcon" class="ti ti-home ti-fw"></i>
|
||||
</MkA>
|
||||
<template v-for="item in menu">
|
||||
<div v-if="item === '-'" class="divider"></div>
|
||||
<component :is="navbarItemDef[item].to ? 'MkA' : 'button'" v-else-if="navbarItemDef[item] && (navbarItemDef[item].show !== false)" v-click-anime v-tooltip="navbarItemDef[item].title" class="item _button" :class="item" activeClass="active" :to="navbarItemDef[item].to" v-on="navbarItemDef[item].action ? { click: navbarItemDef[item].action } : {}">
|
||||
<i class="ti-fw" :class="navbarItemDef[item].icon"></i>
|
||||
<span v-if="navbarItemDef[item].indicated" class="indicator _blink"><i class="_indicatorCircle"></i></span>
|
||||
<div v-if="item === '-'" :class="$style.divider"></div>
|
||||
<component :is="navbarItemDef[item].to ? 'MkA' : 'button'" v-else-if="navbarItemDef[item] && (navbarItemDef[item].show !== false)" v-click-anime v-tooltip="navbarItemDef[item].title" class="_button" :class="$style.item" activeClass="active" :to="navbarItemDef[item].to" v-on="navbarItemDef[item].action ? { click: navbarItemDef[item].action } : {}">
|
||||
<i :class="[$style.itemIcon, navbarItemDef[item].icon]" class="ti-fw"></i>
|
||||
<span v-if="navbarItemDef[item].indicated" :class="$style.indicator" class="_blink"><i class="_indicatorCircle"></i></span>
|
||||
</component>
|
||||
</template>
|
||||
<div class="divider"></div>
|
||||
<div :class="$style.divider"></div>
|
||||
<MkA v-if="$i && ($i.isAdmin || $i.isModerator)" v-click-anime v-tooltip="i18n.ts.controlPanel" class="item" activeClass="active" to="/admin" :behavior="settingsWindowed ? 'window' : null">
|
||||
<i class="ti ti-dashboard ti-fw"></i>
|
||||
<i :class="$style.itemIcon" class="ti ti-dashboard ti-fw"></i>
|
||||
</MkA>
|
||||
<button v-click-anime class="item _button" @click="more">
|
||||
<i class="ti ti-dots ti-fw"></i>
|
||||
<span v-if="otherNavItemIndicated" class="indicator _blink"><i class="_indicatorCircle"></i></span>
|
||||
<button v-click-anime :class="$style.item" class="_button" @click="more">
|
||||
<i :class="$style.itemIcon" class="ti ti-dots ti-fw"></i>
|
||||
<span v-if="otherNavItemIndicated" :class="$style.indicator" class="_blink"><i class="_indicatorCircle"></i></span>
|
||||
</button>
|
||||
</div>
|
||||
<div class="right">
|
||||
<MkA v-click-anime v-tooltip="i18n.ts.settings" class="item" activeClass="active" to="/settings" :behavior="settingsWindowed ? 'window' : null">
|
||||
<i class="ti ti-settings ti-fw"></i>
|
||||
<div :class="$style.right">
|
||||
<MkA v-click-anime v-tooltip="i18n.ts.settings" :class="$style.item" activeClass="active" to="/settings" :behavior="settingsWindowed ? 'window' : null">
|
||||
<i :class="$style.itemIcon" class="ti ti-settings ti-fw"></i>
|
||||
</MkA>
|
||||
<button v-if="$i" v-click-anime class="item _button account" @click="openAccountMenu">
|
||||
<MkAvatar :user="$i" class="avatar"/><MkAcct class="acct" :user="$i"/>
|
||||
<button v-if="$i" v-click-anime :class="[$style.item, $style.account]" class="_button" @click="openAccountMenu">
|
||||
<MkAvatar :user="$i" :class="$style.avatar"/><MkAcct :class="$style.acct" :user="$i"/>
|
||||
</button>
|
||||
<div class="post" @click="os.post()">
|
||||
<MkButton class="button" gradate full rounded>
|
||||
<div :class="$style.post" @click="os.post()">
|
||||
<MkButton :class="$style.postButton" gradate rounded>
|
||||
<i class="ti ti-pencil ti-fw"></i>
|
||||
</MkButton>
|
||||
</div>
|
||||
|
|
@ -61,6 +61,10 @@ import { getHTMLElementOrNull } from '@/utility/get-dom-node-or-null.js';
|
|||
|
||||
const WINDOW_THRESHOLD = 1400;
|
||||
|
||||
const props = defineProps<{
|
||||
acrylic?: boolean;
|
||||
}>();
|
||||
|
||||
const settingsWindowed = ref(window.innerWidth > WINDOW_THRESHOLD);
|
||||
const menu = ref(prefer.s.menu);
|
||||
// const menuDisplay = computed(store.makeGetterSetter('menuDisplay'));
|
||||
|
|
@ -100,58 +104,40 @@ onMounted(() => {
|
|||
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
.azykntjl {
|
||||
$height: 60px;
|
||||
$avatar-size: 32px;
|
||||
$avatar-margin: 8px;
|
||||
<style lang="scss" module>
|
||||
.root {
|
||||
--height: 60px;
|
||||
|
||||
position: sticky;
|
||||
top: 0;
|
||||
z-index: 1000;
|
||||
width: 100%;
|
||||
height: $height;
|
||||
height: var(--height);
|
||||
contain: strict;
|
||||
background: var(--MI_THEME-navBg);
|
||||
|
||||
&.acrylic {
|
||||
background: color(from var(--MI_THEME-bg) srgb r g b / 0.75);
|
||||
-webkit-backdrop-filter: var(--MI-blur, blur(15px));
|
||||
backdrop-filter: var(--MI-blur, blur(15px));
|
||||
}
|
||||
}
|
||||
|
||||
> .body {
|
||||
.body {
|
||||
max-width: 1380px;
|
||||
margin: 0 auto;
|
||||
display: flex;
|
||||
overflow: auto;
|
||||
overflow-y: clip;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
> .right,
|
||||
> .left {
|
||||
|
||||
> .item {
|
||||
.item {
|
||||
position: relative;
|
||||
font-size: 0.9em;
|
||||
display: inline-block;
|
||||
padding: 0 12px;
|
||||
line-height: $height;
|
||||
|
||||
> i,
|
||||
> .avatar {
|
||||
margin-right: 0;
|
||||
}
|
||||
|
||||
> i {
|
||||
left: 10px;
|
||||
}
|
||||
|
||||
> .avatar {
|
||||
width: $avatar-size;
|
||||
height: $avatar-size;
|
||||
vertical-align: middle;
|
||||
}
|
||||
|
||||
> .indicator {
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: 0;
|
||||
color: var(--MI_THEME-navIndicator);
|
||||
font-size: 8px;
|
||||
}
|
||||
line-height: var(--height);
|
||||
|
||||
&:hover {
|
||||
text-decoration: none;
|
||||
|
|
@ -163,21 +149,54 @@ onMounted(() => {
|
|||
}
|
||||
}
|
||||
|
||||
> .divider {
|
||||
.itemIcon {
|
||||
margin-right: 0;
|
||||
left: 10px;
|
||||
}
|
||||
|
||||
.avatar {
|
||||
margin-right: 0;
|
||||
width: 32px;
|
||||
height: 32px;
|
||||
vertical-align: middle;
|
||||
}
|
||||
|
||||
.acct {
|
||||
margin-left: 8px;
|
||||
|
||||
@media (max-width: 1200px) {
|
||||
display: none;
|
||||
}
|
||||
}
|
||||
|
||||
.indicator {
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: 0;
|
||||
color: var(--MI_THEME-navIndicator);
|
||||
font-size: 8px;
|
||||
}
|
||||
|
||||
.divider {
|
||||
display: inline-block;
|
||||
height: 16px;
|
||||
margin: 0 10px;
|
||||
border-right: solid 0.5px var(--MI_THEME-divider);
|
||||
}
|
||||
|
||||
> .instance {
|
||||
.instance {
|
||||
display: inline-block;
|
||||
position: relative;
|
||||
width: 56px;
|
||||
height: 100%;
|
||||
vertical-align: bottom;
|
||||
position: sticky;
|
||||
top: 0;
|
||||
left: 0;
|
||||
z-index: 1;
|
||||
}
|
||||
|
||||
> img {
|
||||
.instanceIcon {
|
||||
display: inline-block;
|
||||
width: 24px;
|
||||
position: absolute;
|
||||
|
|
@ -187,34 +206,38 @@ onMounted(() => {
|
|||
left: 0;
|
||||
margin: auto;
|
||||
}
|
||||
|
||||
.right {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
margin-left: auto;
|
||||
position: sticky;
|
||||
top: 0;
|
||||
right: 0;
|
||||
z-index: 1;
|
||||
contain: content;
|
||||
background: var(--MI_THEME-navBg);
|
||||
}
|
||||
.acrylic .right {
|
||||
background: transparent;
|
||||
}
|
||||
|
||||
> .post {
|
||||
.post {
|
||||
display: inline-block;
|
||||
margin-right: 8px;
|
||||
}
|
||||
|
||||
> .button {
|
||||
.postButton {
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
padding: 0;
|
||||
min-width: 0;
|
||||
}
|
||||
}
|
||||
|
||||
> .account {
|
||||
.account {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
vertical-align: top;
|
||||
margin-right: 8px;
|
||||
|
||||
> .acct {
|
||||
margin-left: 8px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
> .right {
|
||||
margin-left: auto;
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ SPDX-License-Identifier: AGPL-3.0-only
|
|||
<XSidebar v-if="!isMobile && prefer.r['deck.navbarPosition'].value === 'left'"/>
|
||||
|
||||
<div :class="[$style.main, { [$style.withWallpaper]: withWallpaper, [$style.withSidebarAndTitlebar]: !isMobile && prefer.r['deck.navbarPosition'].value === 'left' && prefer.r.showTitlebar.value }]" :style="{ backgroundImage: prefer.s['deck.wallpaper'] != null ? `url(${ prefer.s['deck.wallpaper'] })` : '' }">
|
||||
<XNavbarH v-if="!isMobile && prefer.r['deck.navbarPosition'].value === 'top'"/>
|
||||
<XNavbarH v-if="!isMobile && prefer.r['deck.navbarPosition'].value === 'top'" :acrylic="withWallpaper"/>
|
||||
|
||||
<XReloadSuggestion v-if="shouldSuggestReload"/>
|
||||
<XPreferenceRestore v-if="shouldSuggestRestoreBackup"/>
|
||||
|
|
@ -71,7 +71,7 @@ SPDX-License-Identifier: AGPL-3.0-only
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<XNavbarH v-if="!isMobile && prefer.r['deck.navbarPosition'].value === 'bottom'"/>
|
||||
<XNavbarH v-if="!isMobile && prefer.r['deck.navbarPosition'].value === 'bottom'" :acrylic="withWallpaper"/>
|
||||
|
||||
<XMobileFooterMenu v-if="isMobile" v-model:drawerMenuShowing="drawerMenuShowing" v-model:widgetsShowing="widgetsShowing"/>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -11,10 +11,10 @@
|
|||
"lint": "pnpm typecheck && pnpm eslint"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/node": "24.9.2",
|
||||
"@types/node": "24.10.1",
|
||||
"@types/wawoff2": "1.0.2",
|
||||
"@typescript-eslint/eslint-plugin": "8.46.2",
|
||||
"@typescript-eslint/parser": "8.46.2"
|
||||
"@typescript-eslint/eslint-plugin": "8.47.0",
|
||||
"@typescript-eslint/parser": "8.47.0"
|
||||
},
|
||||
"dependencies": {
|
||||
"@tabler/icons-webfont": "3.35.0",
|
||||
|
|
|
|||
|
|
@ -25,14 +25,14 @@
|
|||
},
|
||||
"devDependencies": {
|
||||
"@types/matter-js": "0.20.2",
|
||||
"@types/node": "24.9.2",
|
||||
"@types/node": "24.10.1",
|
||||
"@types/seedrandom": "3.0.8",
|
||||
"@typescript-eslint/eslint-plugin": "8.46.2",
|
||||
"@typescript-eslint/parser": "8.46.2",
|
||||
"esbuild": "0.25.11",
|
||||
"@typescript-eslint/eslint-plugin": "8.47.0",
|
||||
"@typescript-eslint/parser": "8.47.0",
|
||||
"esbuild": "0.27.0",
|
||||
"execa": "9.6.0",
|
||||
"glob": "11.0.3",
|
||||
"nodemon": "3.1.10",
|
||||
"glob": "11.1.0",
|
||||
"nodemon": "3.1.11",
|
||||
"typescript": "5.9.3"
|
||||
},
|
||||
"files": [
|
||||
|
|
|
|||
|
|
@ -1223,9 +1223,6 @@ type ClipsListRequest = operations['clips___list']['requestBody']['content']['ap
|
|||
// @public (undocumented)
|
||||
type ClipsListResponse = operations['clips___list']['responses']['200']['content']['application/json'];
|
||||
|
||||
// @public (undocumented)
|
||||
type ClipsMyFavoritesRequest = operations['clips___my-favorites']['requestBody']['content']['application/json'];
|
||||
|
||||
// @public (undocumented)
|
||||
type ClipsMyFavoritesResponse = operations['clips___my-favorites']['responses']['200']['content']['application/json'];
|
||||
|
||||
|
|
@ -1777,7 +1774,6 @@ declare namespace entities {
|
|||
ClipsFavoriteRequest,
|
||||
ClipsListRequest,
|
||||
ClipsListResponse,
|
||||
ClipsMyFavoritesRequest,
|
||||
ClipsMyFavoritesResponse,
|
||||
ClipsNotesRequest,
|
||||
ClipsNotesResponse,
|
||||
|
|
|
|||
|
|
@ -7,16 +7,16 @@
|
|||
"generate": "tsx src/generator.ts && eslint ./built/**/*.ts --fix"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@readme/openapi-parser": "5.2.0",
|
||||
"@types/node": "24.9.2",
|
||||
"@typescript-eslint/eslint-plugin": "8.46.2",
|
||||
"@typescript-eslint/parser": "8.46.2",
|
||||
"@readme/openapi-parser": "5.2.1",
|
||||
"@types/node": "24.10.1",
|
||||
"@typescript-eslint/eslint-plugin": "8.47.0",
|
||||
"@typescript-eslint/parser": "8.47.0",
|
||||
"openapi-types": "12.1.3",
|
||||
"openapi-typescript": "7.10.1",
|
||||
"ts-case-convert": "2.1.0",
|
||||
"tsx": "4.20.6",
|
||||
"typescript": "5.9.3",
|
||||
"eslint": "9.39.0"
|
||||
"eslint": "9.39.1"
|
||||
},
|
||||
"files": [
|
||||
"built"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"type": "module",
|
||||
"name": "misskey-js",
|
||||
"version": "2025.11.1-alpha.1",
|
||||
"version": "2025.11.1",
|
||||
"description": "Misskey SDK for JavaScript",
|
||||
"license": "MIT",
|
||||
"main": "./built/index.js",
|
||||
|
|
@ -37,19 +37,19 @@
|
|||
"directory": "packages/misskey-js"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@microsoft/api-extractor": "7.53.3",
|
||||
"@types/node": "24.9.2",
|
||||
"@typescript-eslint/eslint-plugin": "8.46.2",
|
||||
"@typescript-eslint/parser": "8.46.2",
|
||||
"@vitest/coverage-v8": "3.2.4",
|
||||
"esbuild": "0.25.11",
|
||||
"@microsoft/api-extractor": "7.55.0",
|
||||
"@types/node": "24.10.1",
|
||||
"@typescript-eslint/eslint-plugin": "8.47.0",
|
||||
"@typescript-eslint/parser": "8.47.0",
|
||||
"@vitest/coverage-v8": "4.0.10",
|
||||
"esbuild": "0.27.0",
|
||||
"execa": "9.6.0",
|
||||
"glob": "11.0.3",
|
||||
"glob": "13.0.0",
|
||||
"ncp": "2.0.0",
|
||||
"nodemon": "3.1.10",
|
||||
"nodemon": "3.1.11",
|
||||
"tsd": "0.33.0",
|
||||
"typescript": "5.9.3",
|
||||
"vitest": "3.2.4",
|
||||
"vitest": "4.0.10",
|
||||
"vitest-websocket-mock": "0.5.0"
|
||||
},
|
||||
"files": [
|
||||
|
|
|
|||
|
|
@ -269,7 +269,6 @@ import type {
|
|||
ClipsFavoriteRequest,
|
||||
ClipsListRequest,
|
||||
ClipsListResponse,
|
||||
ClipsMyFavoritesRequest,
|
||||
ClipsMyFavoritesResponse,
|
||||
ClipsNotesRequest,
|
||||
ClipsNotesResponse,
|
||||
|
|
@ -839,7 +838,7 @@ export type Endpoints = {
|
|||
'clips/delete': { req: ClipsDeleteRequest; res: EmptyResponse };
|
||||
'clips/favorite': { req: ClipsFavoriteRequest; res: EmptyResponse };
|
||||
'clips/list': { req: ClipsListRequest; res: ClipsListResponse };
|
||||
'clips/my-favorites': { req: ClipsMyFavoritesRequest; res: ClipsMyFavoritesResponse };
|
||||
'clips/my-favorites': { req: EmptyRequest; res: ClipsMyFavoritesResponse };
|
||||
'clips/notes': { req: ClipsNotesRequest; res: ClipsNotesResponse };
|
||||
'clips/remove-note': { req: ClipsRemoveNoteRequest; res: EmptyResponse };
|
||||
'clips/show': { req: ClipsShowRequest; res: ClipsShowResponse };
|
||||
|
|
|
|||
|
|
@ -272,7 +272,6 @@ export type ClipsDeleteRequest = operations['clips___delete']['requestBody']['co
|
|||
export type ClipsFavoriteRequest = operations['clips___favorite']['requestBody']['content']['application/json'];
|
||||
export type ClipsListRequest = operations['clips___list']['requestBody']['content']['application/json'];
|
||||
export type ClipsListResponse = operations['clips___list']['responses']['200']['content']['application/json'];
|
||||
export type ClipsMyFavoritesRequest = operations['clips___my-favorites']['requestBody']['content']['application/json'];
|
||||
export type ClipsMyFavoritesResponse = operations['clips___my-favorites']['responses']['200']['content']['application/json'];
|
||||
export type ClipsNotesRequest = operations['clips___notes']['requestBody']['content']['application/json'];
|
||||
export type ClipsNotesResponse = operations['clips___notes']['responses']['200']['content']['application/json'];
|
||||
|
|
|
|||
|
|
@ -18638,20 +18638,6 @@ export interface operations {
|
|||
};
|
||||
};
|
||||
'clips___my-favorites': {
|
||||
requestBody: {
|
||||
content: {
|
||||
'application/json': {
|
||||
/** @default 10 */
|
||||
limit?: number;
|
||||
/** Format: misskey:id */
|
||||
sinceId?: string;
|
||||
/** Format: misskey:id */
|
||||
untilId?: string;
|
||||
sinceDate?: number;
|
||||
untilDate?: number;
|
||||
};
|
||||
};
|
||||
};
|
||||
responses: {
|
||||
/** @description OK (with results) */
|
||||
200: {
|
||||
|
|
|
|||
|
|
@ -24,13 +24,13 @@
|
|||
"lint": "pnpm typecheck && pnpm eslint"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/node": "24.9.2",
|
||||
"@typescript-eslint/eslint-plugin": "8.46.2",
|
||||
"@typescript-eslint/parser": "8.46.2",
|
||||
"esbuild": "0.25.11",
|
||||
"@types/node": "24.10.1",
|
||||
"@typescript-eslint/eslint-plugin": "8.47.0",
|
||||
"@typescript-eslint/parser": "8.47.0",
|
||||
"esbuild": "0.27.0",
|
||||
"execa": "9.6.0",
|
||||
"glob": "11.0.3",
|
||||
"nodemon": "3.1.10",
|
||||
"glob": "11.1.0",
|
||||
"nodemon": "3.1.11",
|
||||
"typescript": "5.9.3"
|
||||
},
|
||||
"files": [
|
||||
|
|
|
|||
|
|
@ -9,15 +9,15 @@
|
|||
"lint": "pnpm typecheck && pnpm eslint"
|
||||
},
|
||||
"dependencies": {
|
||||
"esbuild": "0.25.11",
|
||||
"esbuild": "0.27.0",
|
||||
"idb-keyval": "6.2.2",
|
||||
"misskey-js": "workspace:*"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@typescript-eslint/parser": "8.46.2",
|
||||
"@typescript-eslint/parser": "8.47.0",
|
||||
"@typescript/lib-webworker": "npm:@types/serviceworker@0.0.74",
|
||||
"eslint-plugin-import": "2.32.0",
|
||||
"nodemon": "3.1.10",
|
||||
"nodemon": "3.1.11",
|
||||
"typescript": "5.9.3"
|
||||
},
|
||||
"type": "module"
|
||||
|
|
|
|||
3253
pnpm-lock.yaml
3253
pnpm-lock.yaml
File diff suppressed because it is too large
Load Diff
|
|
@ -33,3 +33,4 @@ onlyBuiltDependencies:
|
|||
ignorePatchFailures: false
|
||||
minimumReleaseAge: 10080 # delay 7days to mitigate supply-chain attack
|
||||
minimumReleaseAgeExclude:
|
||||
- '@syuilo/aiscript'
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -11,14 +11,14 @@
|
|||
"devDependencies": {
|
||||
"@types/mdast": "4.0.4",
|
||||
"@types/node": "24.9.1",
|
||||
"@vitest/coverage-v8": "3.2.4",
|
||||
"@vitest/coverage-v8": "4.0.10",
|
||||
"mdast-util-to-string": "4.0.0",
|
||||
"remark": "15.0.1",
|
||||
"remark-parse": "11.0.0",
|
||||
"typescript": "5.9.3",
|
||||
"unified": "11.0.5",
|
||||
"vite": "6.4.1",
|
||||
"vite-node": "3.2.4",
|
||||
"vitest": "3.2.4"
|
||||
"vite": "7.2.2",
|
||||
"vite-node": "5.2.0",
|
||||
"vitest": "4.0.10"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue