mirror of
https://git.joinsharkey.org/Sharkey/Sharkey.git
synced 2024-11-23 21:33:09 +02:00
d28866f71a
* copy block and mute then create follow and unfollow jobs
* copy block and mute and update lists when detecting an account has moved
* no need to care promise orders
* refactor updating actor and target
* automatically accept if a locked account had accepted an old account
* fix exception format
* prevent the old account from calling some endpoints
* do not unfollow when moving
* adjust following and follower counts
* check movedToUri when receiving a follow request
* skip if no need to adjust
* Revert "disable account migration"
This reverts commit 2321214c98
.
* fix translation specifier
* fix checking alsoKnownAs and uri
* fix updating account
* fix refollowing locked account
* decrease followersCount if followed by the old account
* adjust following and followers counts when unfollowing
* fix copying mutings
* prohibit moved account from moving again
* fix move service
* allow app creation after moving
* fix lint
* remove unnecessary field
* fix cache update
* add e2e test
* add e2e test of accepting the new account automatically
* force follow if any error happens
* remove unnecessary joins
* use Array.map instead of for const of
* ユーザーリストの移行は追加のみを行う
* nanka iroiro
* fix misskey-js?
* ✌️
* 移行を行ったアカウントからのフォローリクエストの自動許可を調整
* newUriを外に出す
* newUriを外に出す2
* clean up
* fix newUri
* prevent moving if the destination account has already moved
* set alsoKnownAs via /i/update
* fix database initialization
* add return type
* prohibit updating alsoKnownAs after moving
* skip to add to alsoKnownAs if toUrl is known
* skip adding to the list if it already has
* use Acct.parse instead
* rename error code
* 🎨
* 制限を5から10に緩和
* movedTo(Uri), alsoKnownAsはユーザーidを返すように
* test api res
* fix
* 元アカウントはミュートし続ける
* 🎨
* unfollow
* fix
* getUserUriをUserEntityServiceに
* ?
* job!
* 🎨
* instance => server
* accountMovedShort, forbiddenBecauseYouAreMigrated
* accountMovedShort
* fix test
* import, pin禁止
* 実績を凍結する
* clean up
* ✌️
* change message
* ブロック, フォロー, ミュート, リストのインポートファイルの制限を32MiBに
* Revert "ブロック, フォロー, ミュート, リストのインポートファイルの制限を32MiBに"
This reverts commit 3bd7be35d8aa455cb01ae58f8172a71a50485db1.
* validateAlsoKnownAs
* 移行後2時間以内はインポート可能なファイルサイズを拡大
* clean up
* どうせactorをupdatePersonで更新するならupdatePersonしか移行処理を発行しないことにする
* handle error?
* リモートからの移行処理の条件を是正
* log, port
* fix
* fix
* enhance(dev): non-production環境でhttpサーバー間でもユーザー、ノートの連合が可能なように
* refactor (use checkHttps)
* MISSKEY_WEBFINGER_USE_HTTP
* Environment Variable readme
* NEVER USE IN PRODUCTION
* fix punyHost
* fix indent
* fix
* experimental
---------
Co-authored-by: tamaina <tamaina@hotmail.co.jp>
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
100 lines
3.4 KiB
TypeScript
100 lines
3.4 KiB
TypeScript
process.env.NODE_ENV = 'test';
|
|
|
|
import { jest } from '@jest/globals';
|
|
import { ModuleMocker } from 'jest-mock';
|
|
import { Test } from '@nestjs/testing';
|
|
import { GlobalModule } from '@/GlobalModule.js';
|
|
import { RelayService } from '@/core/RelayService.js';
|
|
import { ApRendererService } from '@/core/activitypub/ApRendererService.js';
|
|
import { CreateSystemUserService } from '@/core/CreateSystemUserService.js';
|
|
import { UserEntityService } from '@/core/entities/UserEntityService.js';
|
|
import { QueueService } from '@/core/QueueService.js';
|
|
import { IdService } from '@/core/IdService.js';
|
|
import type { RelaysRepository } from '@/models/index.js';
|
|
import { DI } from '@/di-symbols.js';
|
|
import type { TestingModule } from '@nestjs/testing';
|
|
import type { MockFunctionMetadata } from 'jest-mock';
|
|
|
|
const moduleMocker = new ModuleMocker(global);
|
|
|
|
describe('RelayService', () => {
|
|
let app: TestingModule;
|
|
let relayService: RelayService;
|
|
let queueService: jest.Mocked<QueueService>;
|
|
let relaysRepository: RelaysRepository;
|
|
let userEntityService: UserEntityService;
|
|
|
|
beforeAll(async () => {
|
|
app = await Test.createTestingModule({
|
|
imports: [
|
|
GlobalModule,
|
|
],
|
|
providers: [
|
|
IdService,
|
|
CreateSystemUserService,
|
|
ApRendererService,
|
|
RelayService,
|
|
UserEntityService,
|
|
],
|
|
})
|
|
.useMocker((token) => {
|
|
if (token === QueueService) {
|
|
return { deliver: jest.fn() };
|
|
}
|
|
if (typeof token === 'function') {
|
|
const mockMetadata = moduleMocker.getMetadata(token) as MockFunctionMetadata<any, any>;
|
|
const Mock = moduleMocker.generateFromMetadata(mockMetadata);
|
|
return new Mock();
|
|
}
|
|
})
|
|
.compile();
|
|
|
|
app.enableShutdownHooks();
|
|
|
|
relayService = app.get<RelayService>(RelayService);
|
|
queueService = app.get<QueueService>(QueueService) as jest.Mocked<QueueService>;
|
|
relaysRepository = app.get<RelaysRepository>(DI.relaysRepository);
|
|
userEntityService = app.get<UserEntityService>(UserEntityService);
|
|
});
|
|
|
|
afterAll(async () => {
|
|
await app.close();
|
|
});
|
|
|
|
test('addRelay', async () => {
|
|
const result = await relayService.addRelay('https://example.com');
|
|
|
|
expect(result.inbox).toBe('https://example.com');
|
|
expect(result.status).toBe('requesting');
|
|
expect(queueService.deliver).toHaveBeenCalled();
|
|
expect(queueService.deliver.mock.lastCall![1]?.type).toBe('Follow');
|
|
expect(queueService.deliver.mock.lastCall![2]).toBe('https://example.com');
|
|
//expect(queueService.deliver.mock.lastCall![0].username).toBe('relay.actor');
|
|
});
|
|
|
|
test('listRelay', async () => {
|
|
const result = await relayService.listRelay();
|
|
|
|
expect(result.length).toBe(1);
|
|
expect(result[0].inbox).toBe('https://example.com');
|
|
expect(result[0].status).toBe('requesting');
|
|
});
|
|
|
|
test('removeRelay: succ', async () => {
|
|
await relayService.removeRelay('https://example.com');
|
|
|
|
expect(queueService.deliver).toHaveBeenCalled();
|
|
expect(queueService.deliver.mock.lastCall![1]?.type).toBe('Undo');
|
|
expect(queueService.deliver.mock.lastCall![1]?.object.type).toBe('Follow');
|
|
expect(queueService.deliver.mock.lastCall![2]).toBe('https://example.com');
|
|
//expect(queueService.deliver.mock.lastCall![0].username).toBe('relay.actor');
|
|
|
|
const list = await relayService.listRelay();
|
|
expect(list.length).toBe(0);
|
|
});
|
|
|
|
test('removeRelay: fail', async () => {
|
|
await expect(relayService.removeRelay('https://x.example.com'))
|
|
.rejects.toThrow('relay not found');
|
|
});
|
|
});
|