Merge branch 'develop' into mkusername-empty

packages/backend/test/unit/MfmService.ts

@@ -0,0 +1,102 @@
+import * as assert from 'assert';
+import * as mfm from 'mfm-js';
+import { Test } from '@nestjs/testing';
+
+import { CoreModule } from '@/core/CoreModule.js';
+import { MfmService } from '@/core/MfmService.js';
+import { GlobalModule } from '@/GlobalModule.js';
+
+describe('MfmService', () => {
+	let mfmService: MfmService;
+
+	beforeAll(async () => {
+		const app = await Test.createTestingModule({
+			imports: [GlobalModule, CoreModule],
+		}).compile();
+		mfmService = app.get<MfmService>(MfmService);
+	});
+
+	describe('toHtml', () => {
+		test('br', () => {
+			const input = 'foo\nbar\nbaz';
+			const output = '<p><span>foo<br>bar<br>baz</span></p>';
+			assert.equal(mfmService.toHtml(mfm.parse(input)), output);
+		});
+
+		test('br alt', () => {
+			const input = 'foo\r\nbar\rbaz';
+			const output = '<p><span>foo<br>bar<br>baz</span></p>';
+			assert.equal(mfmService.toHtml(mfm.parse(input)), output);
+		});
+	});
+
+	describe('fromHtml', () => {
+		test('p', () => {
+			assert.deepStrictEqual(mfmService.fromHtml('<p>a</p><p>b</p>'), 'a\n\nb');
+		});
+
+		test('block element', () => {
+			assert.deepStrictEqual(mfmService.fromHtml('<div>a</div><div>b</div>'), 'a\nb');
+		});
+
+		test('inline element', () => {
+			assert.deepStrictEqual(mfmService.fromHtml('<ul><li>a</li><li>b</li></ul>'), 'a\nb');
+		});
+
+		test('block code', () => {
+			assert.deepStrictEqual(mfmService.fromHtml('<pre><code>a\nb</code></pre>'), '```\na\nb\n```');
+		});
+
+		test('inline code', () => {
+			assert.deepStrictEqual(mfmService.fromHtml('<code>a</code>'), '`a`');
+		});
+
+		test('quote', () => {
+			assert.deepStrictEqual(mfmService.fromHtml('<blockquote>a\nb</blockquote>'), '> a\n> b');
+		});
+
+		test('br', () => {
+			assert.deepStrictEqual(mfmService.fromHtml('<p>abc<br><br/>d</p>'), 'abc\n\nd');
+		});
+
+		test('link with different text', () => {
+			assert.deepStrictEqual(mfmService.fromHtml('<p>a <a href="https://example.com/b">c</a> d</p>'), 'a [c](https://example.com/b) d');
+		});
+
+		test('link with different text, but not encoded', () => {
+			assert.deepStrictEqual(mfmService.fromHtml('<p>a <a href="https://example.com/ä">c</a> d</p>'), 'a [c](<https://example.com/ä>) d');
+		});
+
+		test('link with same text', () => {
+			assert.deepStrictEqual(mfmService.fromHtml('<p>a <a href="https://example.com/b">https://example.com/b</a> d</p>'), 'a https://example.com/b d');
+		});
+
+		test('link with same text, but not encoded', () => {
+			assert.deepStrictEqual(mfmService.fromHtml('<p>a <a href="https://example.com/ä">https://example.com/ä</a> d</p>'), 'a <https://example.com/ä> d');
+		});
+
+		test('link with no url', () => {
+			assert.deepStrictEqual(mfmService.fromHtml('<p>a <a href="b">c</a> d</p>'), 'a [c](b) d');
+		});
+
+		test('link without href', () => {
+			assert.deepStrictEqual(mfmService.fromHtml('<p>a <a>c</a> d</p>'), 'a c d');
+		});
+
+		test('link without text', () => {
+			assert.deepStrictEqual(mfmService.fromHtml('<p>a <a href="https://example.com/b"></a> d</p>'), 'a https://example.com/b d');
+		});
+
+		test('link without both', () => {
+			assert.deepStrictEqual(mfmService.fromHtml('<p>a <a></a> d</p>'), 'a  d');
+		});
+
+		test('mention', () => {
+			assert.deepStrictEqual(mfmService.fromHtml('<p>a <a href="https://example.com/@user" class="u-url mention">@user</a> d</p>'), 'a @user@example.com d');
+		});
+
+		test('hashtag', () => {
+			assert.deepStrictEqual(mfmService.fromHtml('<p>a <a href="https://example.com/tags/a">#a</a> d</p>', ['#a']), 'a #a d');
+		});
+	});
+});

packages/backend/test/unit/ReactionService.ts

@@ -0,0 +1,92 @@
+import * as assert from 'assert';
+import { Test } from '@nestjs/testing';
+
+import { CoreModule } from '@/core/CoreModule.js';
+import { ReactionService } from '@/core/ReactionService.js';
+import { GlobalModule } from '@/GlobalModule.js';
+
+describe('ReactionService', () => {
+	let reactionService: ReactionService;
+
+	beforeAll(async () => {
+		const app = await Test.createTestingModule({
+			imports: [GlobalModule, CoreModule],
+		}).compile();
+		reactionService = app.get<ReactionService>(ReactionService);
+	});
+
+	describe('toDbReaction', () => {
+		test('絵文字リアクションはそのまま', async () => {
+			assert.strictEqual(await reactionService.toDbReaction('👍'), '👍');
+			assert.strictEqual(await reactionService.toDbReaction('🍅'), '🍅');
+		});
+
+		test('既存のリアクションは絵文字化する pudding', async () => {
+			assert.strictEqual(await reactionService.toDbReaction('pudding'), '🍮');
+		});
+
+		test('既存のリアクションは絵文字化する like', async () => {
+			assert.strictEqual(await reactionService.toDbReaction('like'), '👍');
+		});
+
+		test('既存のリアクションは絵文字化する love', async () => {
+			assert.strictEqual(await reactionService.toDbReaction('love'), '❤');
+		});
+
+		test('既存のリアクションは絵文字化する laugh', async () => {
+			assert.strictEqual(await reactionService.toDbReaction('laugh'), '😆');
+		});
+
+		test('既存のリアクションは絵文字化する hmm', async () => {
+			assert.strictEqual(await reactionService.toDbReaction('hmm'), '🤔');
+		});
+
+		test('既存のリアクションは絵文字化する surprise', async () => {
+			assert.strictEqual(await reactionService.toDbReaction('surprise'), '😮');
+		});
+
+		test('既存のリアクションは絵文字化する congrats', async () => {
+			assert.strictEqual(await reactionService.toDbReaction('congrats'), '🎉');
+		});
+
+		test('既存のリアクションは絵文字化する angry', async () => {
+			assert.strictEqual(await reactionService.toDbReaction('angry'), '💢');
+		});
+
+		test('既存のリアクションは絵文字化する confused', async () => {
+			assert.strictEqual(await reactionService.toDbReaction('confused'), '😥');
+		});
+
+		test('既存のリアクションは絵文字化する rip', async () => {
+			assert.strictEqual(await reactionService.toDbReaction('rip'), '😇');
+		});
+
+		test('既存のリアクションは絵文字化する star', async () => {
+			assert.strictEqual(await reactionService.toDbReaction('star'), '⭐');
+		});
+
+		test('異体字セレクタ除去', async () => {
+			assert.strictEqual(await reactionService.toDbReaction('㊗️'), '㊗');
+		});
+
+		test('異体字セレクタ除去 必要なし', async () => {
+			assert.strictEqual(await reactionService.toDbReaction('㊗'), '㊗');
+		});
+
+		test('fallback - undefined', async () => {
+			assert.strictEqual(await reactionService.toDbReaction(undefined), '👍');
+		});
+
+		test('fallback - null', async () => {
+			assert.strictEqual(await reactionService.toDbReaction(null), '👍');
+		});
+
+		test('fallback - empty', async () => {
+			assert.strictEqual(await reactionService.toDbReaction(''), '👍');
+		});
+
+		test('fallback - unknown', async () => {
+			assert.strictEqual(await reactionService.toDbReaction('unknown'), '👍');
+		});
+	});
+});

packages/backend/test/unit/ap-request.ts

@@ -0,0 +1,56 @@
+import * as assert from 'assert';
+import httpSignature from '@peertube/http-signature';
+
+import { genRsaKeyPair } from '@/misc/gen-key-pair.js';
+import { ApRequestCreator } from '@/core/activitypub/ApRequestService.js';
+
+export const buildParsedSignature = (signingString: string, signature: string, algorithm: string) => {
+	return {
+		scheme: 'Signature',
+		params: {
+			keyId: 'KeyID',	// dummy, not used for verify
+			algorithm: algorithm,
+			headers: ['(request-target)', 'date', 'host', 'digest'],	// dummy, not used for verify
+			signature: signature,
+		},
+		signingString: signingString,
+		algorithm: algorithm.toUpperCase(),
+		keyId: 'KeyID',	// dummy, not used for verify
+	};
+};
+
+describe('ap-request', () => {
+	test('createSignedPost with verify', async () => {
+		const keypair = await genRsaKeyPair();
+		const key = { keyId: 'x', 'privateKeyPem': keypair.privateKey };
+		const url = 'https://example.com/inbox';
+		const activity = { a: 1 };
+		const body = JSON.stringify(activity);
+		const headers = {
+			'User-Agent': 'UA',
+		};
+
+		const req = ApRequestCreator.createSignedPost({ key, url, body, additionalHeaders: headers });
+
+		const parsed = buildParsedSignature(req.signingString, req.signature, 'rsa-sha256');
+
+		const result = httpSignature.verifySignature(parsed, keypair.publicKey);
+		assert.deepStrictEqual(result, true);
+	});
+
+	test('createSignedGet with verify', async () => {
+		const keypair = await genRsaKeyPair();
+		const key = { keyId: 'x', 'privateKeyPem': keypair.privateKey };
+		const url = 'https://example.com/outbox';
+		const headers = {
+			'User-Agent': 'UA',
+		};
+
+		const req = ApRequestCreator.createSignedGet({ key, url, additionalHeaders: headers });
+
+		const parsed = buildParsedSignature(req.signingString, req.signature, 'rsa-sha256');
+
+		const result = httpSignature.verifySignature(parsed, keypair.publicKey);
+		assert.deepStrictEqual(result, true);
+	});
+});

packages/backend/test/unit/chart.ts

@@ -19,7 +19,7 @@ import Logger from '@/logger.js';
 describe('Chart', () => {
 	const config = loadConfig();
 	const appLockService = {
-		getChartInsertLock: jest.fn().mockImplementation(() => Promise.resolve(() => {})),
+		getChartInsertLock: () => () => Promise.resolve(() => {}),
 	} as unknown as jest.Mocked<AppLockService>;
 
 	let db: DataSource | undefined;

packages/backend/test/unit/extract-mentions.ts

@@ -0,0 +1,42 @@
+import * as assert from 'assert';
+
+import { parse } from 'mfm-js';
+import { extractMentions } from '@/misc/extract-mentions.js';
+
+describe('Extract mentions', () => {
+	test('simple', () => {
+		const ast = parse('@foo @bar @baz');
+		const mentions = extractMentions(ast);
+		assert.deepStrictEqual(mentions, [{
+			username: 'foo',
+			acct: '@foo',
+			host: null,
+		}, {
+			username: 'bar',
+			acct: '@bar',
+			host: null,
+		}, {
+			username: 'baz',
+			acct: '@baz',
+			host: null,
+		}]);
+	});
+
+	test('nested', () => {
+		const ast = parse('@foo **@bar** @baz');
+		const mentions = extractMentions(ast);
+		assert.deepStrictEqual(mentions, [{
+			username: 'foo',
+			acct: '@foo',
+			host: null,
+		}, {
+			username: 'bar',
+			acct: '@bar',
+			host: null,
+		}, {
+			username: 'baz',
+			acct: '@baz',
+			host: null,
+		}]);
+	});
+});