Merge tag '2023.9.2' into merge-upstream

2023-09-29 22:16:04 +09:00
parent 8d35299f62 7adc8fcaf5
commit e2c9ed355b
144 changed files with 2519 additions and 1660 deletions
--- a/packages/backend/src/core/CustomEmojiService.ts
+++ b/packages/backend/src/core/CustomEmojiService.ts
@@ -17,7 +17,7 @@ import { bindThis } from '@/decorators.js';
 import { MemoryKVCache, RedisSingleCache } from '@/misc/cache.js';
 import { UtilityService } from '@/core/UtilityService.js';
 import { query } from '@/misc/prelude/url.js';
-import type { Serialized } from '@/server/api/stream/types.js';
+import type { Serialized } from '@/types.js';
 import { ModerationLogService } from '@/core/ModerationLogService.js';

 const parseEmojiStrRegexp = /^(\w+)(?:@([\w.-]+))?$/;