diff options
| author | zyoshoka <107108195+zyoshoka@users.noreply.github.com> | 2024-02-28 17:43:17 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-28 17:43:17 +0900 |
| commit | 664aeb3ced65f3911c8a21c2d5ffbd1035aec31a (patch) | |
| tree | 59668cf9cec5f1297dba78d7792aaa621c5ef64f /packages/backend/test/utils.ts | |
| parent | refactor(backend): ノートのエクスポート処理でStreams APIを使... (diff) | |
| download | sharkey-664aeb3ced65f3911c8a21c2d5ffbd1035aec31a.tar.gz sharkey-664aeb3ced65f3911c8a21c2d5ffbd1035aec31a.tar.bz2 sharkey-664aeb3ced65f3911c8a21c2d5ffbd1035aec31a.zip | |
fix(backend): リノート時のHTLへのストリーミングの意図しない挙動を修正 (#13425)
* fix(backend): リノート時のストリーミングの意図しない挙動を修正
* Update CHANGELOG.md
* fix: 不要な返り値
* fix: 不適切な条件分岐を修正
* test(backend): add htl tests
---------
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
Diffstat (limited to 'packages/backend/test/utils.ts')
| -rw-r--r-- | packages/backend/test/utils.ts | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/packages/backend/test/utils.ts b/packages/backend/test/utils.ts index a2220ffae6..cd5dddd68d 100644 --- a/packages/backend/test/utils.ts +++ b/packages/backend/test/utils.ts @@ -355,7 +355,7 @@ export const uploadUrl = async (user: UserToken, url: string): Promise<Packed<'D return catcher; }; -export function connectStream(user: UserToken, channel: string, listener: (message: Record<string, any>) => any, params?: any): Promise<WebSocket> { +export function connectStream<C extends keyof misskey.Channels>(user: UserToken, channel: C, listener: (message: Record<string, any>) => any, params?: misskey.Channels[C]['params']): Promise<WebSocket> { return new Promise((res, rej) => { const url = new URL(`ws://127.0.0.1:${port}/streaming`); const options: ClientOptions = {}; @@ -390,7 +390,7 @@ export function connectStream(user: UserToken, channel: string, listener: (messa }); } -export const waitFire = async (user: UserToken, channel: string, trgr: () => any, cond: (msg: Record<string, any>) => boolean, params?: any) => { +export const waitFire = async <C extends keyof misskey.Channels>(user: UserToken, channel: C, trgr: () => any, cond: (msg: Record<string, any>) => boolean, params?: misskey.Channels[C]['params']) => { return new Promise<boolean>(async (res, rej) => { let timer: NodeJS.Timeout | null = null; @@ -435,7 +435,7 @@ export const waitFire = async (user: UserToken, channel: string, trgr: () => any */ export function makeStreamCatcher<T>( user: UserToken, - channel: string, + channel: keyof misskey.Channels, cond: (message: Record<string, any>) => boolean, extractor: (message: Record<string, any>) => T, timeout = 60 * 1000): Promise<T> { |