diff options
Diffstat (limited to 'packages/frontend/src/utility')
5 files changed, 13 insertions, 86 deletions
diff --git a/packages/frontend/src/utility/drive.ts b/packages/frontend/src/utility/drive.ts index fb2825e7f7..64079d125a 100644 --- a/packages/frontend/src/utility/drive.ts +++ b/packages/frontend/src/utility/drive.ts @@ -124,7 +124,7 @@ export function uploadFile(file: File | Blob, options: { const driveFile = JSON.parse(ev.target.response); globalEvents.emit('driveFileCreated', driveFile); resolve(driveFile); - }) as (ev: ProgressEvent<EventTarget>) => any; + }) as (ev: ProgressEvent<EventTarget>) => void; if (options.onProgress) { xhr.upload.onprogress = ev => { diff --git a/packages/frontend/src/utility/image-effector/ImageEffector.ts b/packages/frontend/src/utility/image-effector/ImageEffector.ts index 9d5b961416..10d9d2e6bc 100644 --- a/packages/frontend/src/utility/image-effector/ImageEffector.ts +++ b/packages/frontend/src/utility/image-effector/ImageEffector.ts @@ -13,7 +13,7 @@ interface CommonParamDef { type: string; label?: string; caption?: string; - default: any; + default: unknown; } interface NumberParamDef extends CommonParamDef { diff --git a/packages/frontend/src/utility/paginator.ts b/packages/frontend/src/utility/paginator.ts index 7db55db7d6..59ae1e431a 100644 --- a/packages/frontend/src/utility/paginator.ts +++ b/packages/frontend/src/utility/paginator.ts @@ -5,7 +5,7 @@ import { ref, shallowRef, triggerRef } from 'vue'; import * as Misskey from 'misskey-js'; -import type { ComputedRef, Ref, ShallowRef } from 'vue'; +import type { ComputedRef, Ref, ShallowRef, UnwrapRef } from 'vue'; import { misskeyApi } from '@/utility/misskey-api.js'; const MAX_ITEMS = 30; @@ -19,7 +19,12 @@ export type MisskeyEntity = { _shouldInsertAd_?: boolean; }; -type FilterByEpRes<E extends Record<string, any>> = { +type AbsEndpointType = { + req: unknown; + res: unknown; +}; + +type FilterByEpRes<E extends Record<string, AbsEndpointType>> = { [K in keyof E]: E[K]['res'] extends Array<{ id: string }> ? K : never }[keyof E]; export type PaginatorCompatibleEndpointPaths = FilterByEpRes<Misskey.Endpoints>; @@ -27,6 +32,8 @@ export type PaginatorCompatibleEndpoints = { [K in PaginatorCompatibleEndpointPaths]: Misskey.Endpoints[K]; }; +export type ExtractorFunction<P extends IPaginator, T> = (item: UnwrapRef<P['items']>[number]) => T; + export interface IPaginator<T = unknown, _T = T & MisskeyEntity> { /** * 外部から直接操作しないでください diff --git a/packages/frontend/src/utility/stream-mock.ts b/packages/frontend/src/utility/stream-mock.ts deleted file mode 100644 index 9b1b368de4..0000000000 --- a/packages/frontend/src/utility/stream-mock.ts +++ /dev/null @@ -1,81 +0,0 @@ -/* - * SPDX-FileCopyrightText: syuilo and misskey-project - * SPDX-License-Identifier: AGPL-3.0-only - */ - -import { EventEmitter } from 'eventemitter3'; -import * as Misskey from 'misskey-js'; -import type { Channels, StreamEvents, IStream, IChannelConnection } from 'misskey-js'; - -type AnyOf<T extends Record<any, any>> = T[keyof T]; -type OmitFirst<T extends any[]> = T extends [any, ...infer R] ? R : never; - -/** - * Websocket無効化時に使うStreamのモック（なにもしない） - */ -export class StreamMock extends EventEmitter<StreamEvents> implements IStream { - public readonly state = 'initializing'; - - constructor(...args: ConstructorParameters<typeof Misskey.Stream>) { - super(); - // do nothing - } - - public useChannel<C extends keyof Channels>(channel: C, params?: Channels[C]['params'], name?: string): ChannelConnectionMock<Channels[C]> { - return new ChannelConnectionMock(this, channel, name); - } - - public removeSharedConnection(connection: any): void { - // do nothing - } - - public removeSharedConnectionPool(pool: any): void { - // do nothing - } - - public disconnectToChannel(): void { - // do nothing - } - - public send(typeOrPayload: string): void; - public send(typeOrPayload: string, payload: any): void; - public send(typeOrPayload: Record<string, any> | any[]): void; - public send(typeOrPayload: string | Record<string, any> | any[], payload?: any): void { - // do nothing - } - - public ping(): void { - // do nothing - } - - public heartbeat(): void { - // do nothing - } - - public close(): void { - // do nothing - } -} - -class ChannelConnectionMock<Channel extends AnyOf<Channels> = any> extends EventEmitter<Channel['events']> implements IChannelConnection<Channel> { - public id = ''; - public name?: string; // for debug - public inCount = 0; // for debug - public outCount = 0; // for debug - public channel: string; - - constructor(stream: IStream, ...args: OmitFirst<ConstructorParameters<typeof Misskey.ChannelConnection<Channel>>>) { - super(); - - this.channel = args[0]; - this.name = args[1]; - } - - public send<T extends keyof Channel['receives']>(type: T, body: Channel['receives'][T]): void { - // do nothing - } - - public dispose(): void { - // do nothing - } -} diff --git a/packages/frontend/src/utility/watermark/WatermarkRenderer.ts b/packages/frontend/src/utility/watermark/WatermarkRenderer.ts index 766d45148a..32341a9e10 100644 --- a/packages/frontend/src/utility/watermark/WatermarkRenderer.ts +++ b/packages/frontend/src/utility/watermark/WatermarkRenderer.ts @@ -222,7 +222,8 @@ export class WatermarkRenderer { }, }); } else { - throw new Error(`Unrecognized layer type: ${(layer as any).type}`); + // @ts-expect-error Should be unreachable + throw new Error(`Unrecognized layer type: ${layer.type}`); } } |