monkee.ch/monkeeShark
1
0
Fork 0
Code Pull requests Activity

tweak

Browse source
This commit is contained in:
syuilo 2023-10-04 11:32:33 +09:00
parent a40734d417
commit 610b68c8ff
3 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/backend/src/server/api/endpoints/users/notes.ts
View file

@ -18,8 +18,6 @@ import { ApiError } from '../../error.js';
export const meta = { export const meta = {
tags: ['users', 'notes'], tags: ['users', 'notes'],
description: 'Show all notes that this user created.',
res: { res: {
type: 'array', type: 'array',
optional: false, nullable: false, optional: false, nullable: false,

26
packages/backend/test/e2e/timelines.ts
View file

@ -7,10 +7,14 @@ process.env.NODE_ENV = 'test';
process.env.FORCE_FOLLOW_REMOTE_USER_FOR_TESTING = 'true'; process.env.FORCE_FOLLOW_REMOTE_USER_FOR_TESTING = 'true';
import * as assert from 'assert'; import * as assert from 'assert';
import { signup, api, post, react, startServer, waitFire, sleep, uploadUrl } from '../utils.js'; import { signup, api, post, react, startServer, waitFire, sleep, uploadUrl, randomString } from '../utils.js';
import type { INestApplicationContext } from '@nestjs/common'; import type { INestApplicationContext } from '@nestjs/common';
import type * as misskey from 'misskey-js'; import type * as misskey from 'misskey-js';
function genHost() {
return randomString() + '.example.com';
}
let app: INestApplicationContext; let app: INestApplicationContext;
beforeAll(async () => { beforeAll(async () => {
@ -290,7 +294,7 @@ describe('Timelines', () => {
}); });
test.concurrent('フォローしているリモートユーザーのノートが含まれる', async () => { test.concurrent('フォローしているリモートユーザーのノートが含まれる', async () => {
const [alice, bob] = await Promise.all([signup(), signup({ host: 'example.com' })]); const [alice, bob] = await Promise.all([signup(), signup({ host: genHost() })]);
await api('/following/create', { userId: bob.id }, alice); await api('/following/create', { userId: bob.id }, alice);
const bobNote = await post(bob, { text: 'hi' }); const bobNote = await post(bob, { text: 'hi' });
@ -303,7 +307,7 @@ describe('Timelines', () => {
}); });
test.concurrent('フォローしているリモートユーザーの visibility: home なノートが含まれる', async () => { test.concurrent('フォローしているリモートユーザーの visibility: home なノートが含まれる', async () => {
const [alice, bob] = await Promise.all([signup(), signup({ host: 'example.com' })]); const [alice, bob] = await Promise.all([signup(), signup({ host: genHost() })]);
await api('/following/create', { userId: bob.id }, alice); await api('/following/create', { userId: bob.id }, alice);
const bobNote = await post(bob, { text: 'hi', visibility: 'home' }); const bobNote = await post(bob, { text: 'hi', visibility: 'home' });
@ -355,7 +359,7 @@ describe('Timelines', () => {
}); });
test.concurrent('リモートユーザーのノートが含まれない', async () => { test.concurrent('リモートユーザーのノートが含まれない', async () => {
const [alice, bob] = await Promise.all([signup(), signup({ host: 'example.com' })]); const [alice, bob] = await Promise.all([signup(), signup({ host: genHost() })]);
const bobNote = await post(bob, { text: 'hi' }); const bobNote = await post(bob, { text: 'hi' });
@ -487,7 +491,7 @@ describe('Timelines', () => {
}); });
test.concurrent('リモートユーザーのノートが含まれない', async () => { test.concurrent('リモートユーザーのノートが含まれない', async () => {
const [alice, bob] = await Promise.all([signup(), signup({ host: 'example.com' })]); const [alice, bob] = await Promise.all([signup(), signup({ host: genHost() })]);
const bobNote = await post(bob, { text: 'hi' }); const bobNote = await post(bob, { text: 'hi' });
@ -499,7 +503,7 @@ describe('Timelines', () => {
}); });
test.concurrent('フォローしているリモートユーザーのノートが含まれる', async () => { test.concurrent('フォローしているリモートユーザーのノートが含まれる', async () => {
const [alice, bob] = await Promise.all([signup(), signup({ host: 'example.com' })]); const [alice, bob] = await Promise.all([signup(), signup({ host: genHost() })]);
await api('/following/create', { userId: bob.id }, alice); await api('/following/create', { userId: bob.id }, alice);
const bobNote = await post(bob, { text: 'hi' }); const bobNote = await post(bob, { text: 'hi' });
@ -512,7 +516,7 @@ describe('Timelines', () => {
}); });
test.concurrent('フォローしているリモートユーザーの visibility: home なノートが含まれる', async () => { test.concurrent('フォローしているリモートユーザーの visibility: home なノートが含まれる', async () => {
const [alice, bob] = await Promise.all([signup(), signup({ host: 'example.com' })]); const [alice, bob] = await Promise.all([signup(), signup({ host: genHost() })]);
await api('/following/create', { userId: bob.id }, alice); await api('/following/create', { userId: bob.id }, alice);
const bobNote = await post(bob, { text: 'hi', visibility: 'home' }); const bobNote = await post(bob, { text: 'hi', visibility: 'home' });
@ -704,7 +708,7 @@ describe('Timelines', () => {
await sleep(100); // redisに追加されるのを待つ await sleep(100); // redisに追加されるのを待つ
const res = await api('/users/notes', {}, alice); const res = await api('/users/notes', { userId: bob.id }, alice);
assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), false); assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), false);
}); });
@ -717,7 +721,7 @@ describe('Timelines', () => {
await sleep(100); // redisに追加されるのを待つ await sleep(100); // redisに追加されるのを待つ
const res = await api('/users/notes', {}, alice); const res = await api('/users/notes', { userId: bob.id }, alice);
assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), true); assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), true);
assert.strictEqual(res.body.find((note: any) => note.id === bobNote.id).text, 'hi'); assert.strictEqual(res.body.find((note: any) => note.id === bobNote.id).text, 'hi');
@ -732,7 +736,7 @@ describe('Timelines', () => {
await sleep(100); // redisに追加されるのを待つ await sleep(100); // redisに追加されるのを待つ
const res = await api('/users/notes', {}, alice); const res = await api('/users/notes', { userId: bob.id }, alice);
assert.strictEqual(res.body.some((note: any) => note.id === bobNote1.id), true); assert.strictEqual(res.body.some((note: any) => note.id === bobNote1.id), true);
assert.strictEqual(res.body.some((note: any) => note.id === bobNote2.id), false); assert.strictEqual(res.body.some((note: any) => note.id === bobNote2.id), false);
@ -747,7 +751,7 @@ describe('Timelines', () => {
await sleep(100); // redisに追加されるのを待つ await sleep(100); // redisに追加されるのを待つ
const res = await api('/users/notes', { withReplies: true }, alice); const res = await api('/users/notes', { userId: bob.id, withReplies: true }, alice);
assert.strictEqual(res.body.some((note: any) => note.id === bobNote1.id), true); assert.strictEqual(res.body.some((note: any) => note.id === bobNote1.id), true);
assert.strictEqual(res.body.some((note: any) => note.id === bobNote2.id), true); assert.strictEqual(res.body.some((note: any) => note.id === bobNote2.id), true);

2
packages/backend/test/utils.ts
View file

@ -99,7 +99,7 @@ export const relativeFetch = async (path: string, init?: RequestInit | undefined
return await fetch(new URL(path, `http://127.0.0.1:${port}/`).toString(), init); return await fetch(new URL(path, `http://127.0.0.1:${port}/`).toString(), init);
}; };
function randomString(chars = 'abcdefghijklmnopqrstuvwxyz0123456789', length = 16) { export function randomString(chars = 'abcdefghijklmnopqrstuvwxyz0123456789', length = 16) {
let randomString = ''; let randomString = '';
for (let i = 0; i < length; i++) { for (let i = 0; i < length; i++) {
randomString += chars[Math.floor(Math.random() * chars.length)]; randomString += chars[Math.floor(Math.random() * chars.length)];