heartles/egirlskey
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

merge: upstream performance changes & instance silencing

Browse source
This commit is contained in:
Mar0xy 2023-10-16 23:38:21 +02:00
commit 68886b9ab5
No known key found for this signature in database
GPG key ID: 56569BBE47D2C828
209 changed files with 1064 additions and 1019 deletions
Download patch file Download diff file Expand all files Collapse all files

1
packages/backend/test/e2e/antennas.ts
View file

@ -174,6 +174,7 @@ describe('アンテナ', () => {
users: [''],
withFile: false,
withReplies: false,
localOnly: false,
} as Antenna;
assert.deepStrictEqual(response, expected);
});

2
packages/backend/test/e2e/move.ts
View file

@ -188,6 +188,7 @@ describe('Account Move', () => {
excludeKeywords: [],
users: [],
caseSensitive: false,
localOnly: false,
withReplies: false,
withFile: false,
notify: false,
@ -431,6 +432,7 @@ describe('Account Move', () => {
excludeKeywords: [],
users: [eve.id],
caseSensitive: false,
localOnly: false,
withReplies: false,
withFile: false,
notify: false,

1
packages/backend/test/e2e/streaming.ts
View file

@ -18,7 +18,6 @@ describe('Streaming', () => {
const follow = async (follower: any, followee: any) => {
await Followings.save({
id: 'a',
createdAt: new Date(),
followerId: follower.id,
followeeId: followee.id,
followerHost: follower.host,

8
packages/backend/test/unit/AnnouncementService.ts
View file

@ -35,8 +35,7 @@ describe('AnnouncementService', () => {
function createUser(data: Partial<MiUser> = {}) {
const un = secureRndstr(16);
return usersRepository.insert({
id: genAidx(new Date()),
createdAt: new Date(),
id: genAidx(Date.now()),
username: un,
usernameLower: un,
...data,
@ -44,10 +43,9 @@ describe('AnnouncementService', () => {
.then(x => usersRepository.findOneByOrFail(x.identifiers[0]));
}
function createAnnouncement(data: Partial<MiAnnouncement> = {}) {
function createAnnouncement(data: Partial<MiAnnouncement & { createdAt: Date }> = {}) {
return announcementsRepository.insert({
id: genAidx(new Date()),
createdAt: new Date(),
id: genAidx(data.createdAt ?? new Date()),
updatedAt: null,
title: 'Title',
text: 'Text',

10
packages/backend/test/unit/RoleService.ts
View file

@ -37,8 +37,7 @@ describe('RoleService', () => {
function createUser(data: Partial<MiUser> = {}) {
const un = secureRndstr(16);
return usersRepository.insert({
id: genAidx(new Date()),
createdAt: new Date(),
id: genAidx(Date.now()),
username: un,
usernameLower: un,
...data,
@ -48,8 +47,7 @@ describe('RoleService', () => {
function createRole(data: Partial<MiRole> = {}) {
return rolesRepository.insert({
id: genAidx(new Date()),
createdAt: new Date(),
id: genAidx(Date.now()),
updatedAt: new Date(),
lastUsedAt: new Date(),
description: '',
@ -198,10 +196,10 @@ describe('RoleService', () => {
test('conditional role', async () => {
const user1 = await createUser({
createdAt: new Date(Date.now() - (1000 * 60 * 60 * 24 * 365)),
id: genAidx(Date.now() - (1000 * 60 * 60 * 24 * 365)),
});
const user2 = await createUser({
createdAt: new Date(Date.now() - (1000 * 60 * 60 * 24 * 365)),
id: genAidx(Date.now() - (1000 * 60 * 60 * 24 * 365)),
followersCount: 10,
});
await createRole({

3
packages/backend/test/unit/activitypub.ts
View file

@ -23,6 +23,7 @@ import { secureRndstr } from '@/misc/secure-rndstr.js';
import { DownloadService } from '@/core/DownloadService.js';
import { MetaService } from '@/core/MetaService.js';
import type { MiRemoteUser } from '@/models/User.js';
import { genAidx } from '@/misc/id/aidx.js';
import { MockResolver } from '../misc/mock-resolver.js';
const host = 'https://host1.test';
@ -200,7 +201,7 @@ describe('ActivityPub', () => {
describe('Renderer', () => {
test('Render an announce with visibility: followers', () => {
rendererService.renderAnnounce(null, {
createdAt: new Date(0),
id: genAidx(Date.now()),
visibility: 'followers',
} as MiNote);
});

26
packages/backend/test/unit/misc/id.ts
View file

@ -14,44 +14,44 @@ import { ulidRegExp, parseUlid } from '@/misc/id/ulid.js';
describe('misc:id', () => {
test('aid', () => {
const date = new Date();
const date = Date.now();
const gotAid = genAid(date);
expect(gotAid).toMatch(aidRegExp);
expect(parseAid(gotAid).date.getTime()).toBe(date.getTime());
expect(parseAid(gotAid).date.getTime()).toBe(date);
});
test('aidx', () => {
const date = new Date();
const date = Date.now();
const gotAidx = genAidx(date);
expect(gotAidx).toMatch(aidxRegExp);
expect(parseAidx(gotAidx).date.getTime()).toBe(date.getTime());
expect(parseAidx(gotAidx).date.getTime()).toBe(date);
});
test('meid', () => {
const date = new Date();
const date = Date.now();
const gotMeid = genMeid(date);
expect(gotMeid).toMatch(meidRegExp);
expect(parseMeid(gotMeid).date.getTime()).toBe(date.getTime());
expect(parseMeid(gotMeid).date.getTime()).toBe(date);
});
test('meidg', () => {
const date = new Date();
const date = Date.now();
const gotMeidg = genMeidg(date);
expect(gotMeidg).toMatch(meidgRegExp);
expect(parseMeidg(gotMeidg).date.getTime()).toBe(date.getTime());
expect(parseMeidg(gotMeidg).date.getTime()).toBe(date);
});
test('objectid', () => {
const date = new Date();
const date = Date.now();
const gotObjectId = genObjectId(date);
expect(gotObjectId).toMatch(objectIdRegExp);
expect(Math.floor(parseObjectId(gotObjectId).date.getTime() / 1000)).toBe(Math.floor(date.getTime() / 1000));
expect(Math.floor(parseObjectId(gotObjectId).date.getTime() / 1000)).toBe(Math.floor(date / 1000));
});
test('ulid', () => {
const date = new Date();
const gotUlid = ulid(date.getTime());
const date = Date.now();
const gotUlid = ulid(date);
expect(gotUlid).toMatch(ulidRegExp);
expect(parseUlid(gotUlid).date.getTime()).toBe(date.getTime());
expect(parseUlid(gotUlid).date.getTime()).toBe(date);
});
});