merge upstream 2025-02-03

2025-02-03 14:31:26 -05:00 · 2025-02-03 14:31:26 -05:00 · a4e86758c1
commit a4e86758c1
parent 6bc0cd251f 9c70a4e631
264 changed files with 15775 additions and 4919 deletions
--- a/packages/backend/test-federation/test/note.test.ts
+++ b/packages/backend/test-federation/test/note.test.ts
@ -131,11 +131,7 @@ describe('Note', () => {
 			rejects(
 				async () => await bob.client.request('ap/show', { uri: `https://a.test/notes/${note.id}` }),
 				(err: any) => {
-					/**
-					 * FIXME: this error is not handled
-					 * @see https://github.com/misskey-dev/misskey/issues/12736
-					 */
-					strictEqual(err.code, 'INTERNAL_ERROR');
+					strictEqual(err.code, 'REQUEST_FAILED');
 					return true;
 				},
 			);