mirror of
https://activitypub.software/TransFem-org/Sharkey.git
synced 2024-12-15 00:55:48 +01:00
31e82fc29a
* kill any on utils:api
* kill any on timeline test
* use optional chain to kill TS2532 on timeline test
変更前: 該当ノートが見つからなければundefinedに対するプロパティアクセスとしてテストがクラッシュ
変更後: 該当ノートが見つからなければoptional chainがundefinedとして評価されるが、strictEqualの右辺がnon-nullableなためアサーションに失敗しテストがクラッシュ
* kill `as any` for ApMfmService
* kill argument any for api-visibility
* kill argument any across a few tests
* do not return value that has yielded from `await`-ing `Promise<void>`
* force cast
* runtime non-null assertion to coerce
* rewrite `assert.notEqual(expr, null)` to `assert.ok(expr)`
こうすることでassertion type扱いになり、non-nullableになる
* change return type of `failedApiCall` to `void`
戻り値がどこにも使われていない
* split bindings for exports.ts
型が合わなくて文句を言ってくるので適切に分割
* runtime non-null assertion
* runtime non-null assertion
* 何故かうまく行かないので、とりあえずXORしてみる
* Revert "何故かうまく行かないので、とりあえずXORしてみる"
This reverts commit 48cf32c930924840d0892af92d71b9437acb5844.
* castAsErrorで安全ではないキャストを隠蔽
* 型アサーションの追加
* 型アサーションの追加
* 型アサーションの追加
* voidで値を返さない
* castAsError
* assert.ok => kill nullability
* もはや明示的な型の指定は必要ない
* castAsError
* castAsError
* 型アサーションの追加
* nullableを一旦抑止
* 変数を分離して型エラーを排除
* 不要なプロパティを削除する処理を隠蔽してanyを排除
* Repository type
* simple type
* assert.ok => kill nullability
* revert `as any` drop
reverts fe95c05b3f53266108128680d9358a3796844232 partialy
* test: fix invalid assertion
partially revert b99b7b5392d9d20c81dfee1346ba8b33ff9e1fbb
* test: 52d8a54fc7
により型が合うようになった部分の`as any`を除去
* format
* test: apply https://github.com/misskey-dev/misskey/pull/14054#discussion_r1672369526 (part 1)
* test: use non-null assertion to suppress too many error
* Update packages/backend/test/utils.ts
Co-authored-by: anatawa12 <anatawa12@icloud.com>
---------
Co-authored-by: anatawa12 <anatawa12@icloud.com>
101 lines
4 KiB
TypeScript
101 lines
4 KiB
TypeScript
/*
|
|
* SPDX-FileCopyrightText: syuilo and misskey-project
|
|
* SPDX-License-Identifier: AGPL-3.0-only
|
|
*/
|
|
|
|
process.env.NODE_ENV = 'test';
|
|
|
|
import * as assert from 'assert';
|
|
import { api, connectStream, post, signup } from '../utils.js';
|
|
import type * as misskey from 'misskey-js';
|
|
|
|
describe('Note thread mute', () => {
|
|
let alice: misskey.entities.SignupResponse;
|
|
let bob: misskey.entities.SignupResponse;
|
|
let carol: misskey.entities.SignupResponse;
|
|
|
|
beforeAll(async () => {
|
|
alice = await signup({ username: 'alice' });
|
|
bob = await signup({ username: 'bob' });
|
|
carol = await signup({ username: 'carol' });
|
|
}, 1000 * 60 * 2);
|
|
|
|
test('notes/mentions にミュートしているスレッドの投稿が含まれない', async () => {
|
|
const bobNote = await post(bob, { text: '@alice @carol root note' });
|
|
const aliceReply = await post(alice, { replyId: bobNote.id, text: '@bob @carol child note' });
|
|
|
|
await api('notes/thread-muting/create', { noteId: bobNote.id }, alice);
|
|
|
|
const carolReply = await post(carol, { replyId: bobNote.id, text: '@bob @alice child note' });
|
|
const carolReplyWithoutMention = await post(carol, { replyId: aliceReply.id, text: 'child note' });
|
|
|
|
const res = await api('notes/mentions', {}, alice);
|
|
|
|
assert.strictEqual(res.status, 200);
|
|
assert.strictEqual(Array.isArray(res.body), true);
|
|
assert.strictEqual(res.body.some(note => note.id === bobNote.id), false);
|
|
assert.strictEqual(res.body.some(note => note.id === carolReply.id), false);
|
|
assert.strictEqual(res.body.some(note => note.id === carolReplyWithoutMention.id), false);
|
|
});
|
|
|
|
test('ミュートしているスレッドからメンションされても、hasUnreadMentions が true にならない', async () => {
|
|
// 状態リセット
|
|
await api('i/read-all-unread-notes', {}, alice);
|
|
|
|
const bobNote = await post(bob, { text: '@alice @carol root note' });
|
|
|
|
await api('notes/thread-muting/create', { noteId: bobNote.id }, alice);
|
|
|
|
const carolReply = await post(carol, { replyId: bobNote.id, text: '@bob @alice child note' });
|
|
|
|
const res = await api('i', {}, alice);
|
|
|
|
assert.strictEqual(res.status, 200);
|
|
assert.strictEqual(res.body.hasUnreadMentions, false);
|
|
});
|
|
|
|
test('ミュートしているスレッドからメンションされても、ストリームに unreadMention イベントが流れてこない', () => new Promise<void>(async done => {
|
|
// 状態リセット
|
|
await api('i/read-all-unread-notes', {}, alice);
|
|
|
|
const bobNote = await post(bob, { text: '@alice @carol root note' });
|
|
|
|
await api('notes/thread-muting/create', { noteId: bobNote.id }, alice);
|
|
|
|
let fired = false;
|
|
|
|
const ws = await connectStream(alice, 'main', async ({ type, body }) => {
|
|
if (type === 'unreadMention') {
|
|
if (body === bobNote.id) return;
|
|
fired = true;
|
|
}
|
|
});
|
|
|
|
const carolReply = await post(carol, { replyId: bobNote.id, text: '@bob @alice child note' });
|
|
|
|
setTimeout(() => {
|
|
assert.strictEqual(fired, false);
|
|
ws.close();
|
|
done();
|
|
}, 5000);
|
|
}));
|
|
|
|
test('i/notifications にミュートしているスレッドの通知が含まれない', async () => {
|
|
const bobNote = await post(bob, { text: '@alice @carol root note' });
|
|
const aliceReply = await post(alice, { replyId: bobNote.id, text: '@bob @carol child note' });
|
|
|
|
await api('notes/thread-muting/create', { noteId: bobNote.id }, alice);
|
|
|
|
const carolReply = await post(carol, { replyId: bobNote.id, text: '@bob @alice child note' });
|
|
const carolReplyWithoutMention = await post(carol, { replyId: aliceReply.id, text: 'child note' });
|
|
|
|
const res = await api('i/notifications', {}, alice);
|
|
|
|
assert.strictEqual(res.status, 200);
|
|
assert.strictEqual(Array.isArray(res.body), true);
|
|
assert.strictEqual(res.body.some(notification => 'note' in notification && notification.note.id === carolReply.id), false);
|
|
assert.strictEqual(res.body.some(notification => 'note' in notification && notification.note.id === carolReplyWithoutMention.id), false);
|
|
|
|
// NOTE: bobの投稿はスレッドミュート前に行われたため通知に含まれていてもよい
|
|
});
|
|
});
|