Merge remote-tracking branch 'misskey/release/2024.5.0' into future-2024-04-25-post

2024-05-11 14:13:07 +01:00
parent a81be17d69 6046ba1841
commit 451b0ecc9b
81 changed files with 16594 additions and 13171 deletions
@@ -22,7 +22,7 @@ import { ModerationLogService } from '@/core/ModerationLogService.js';
 import type { Config } from '@/config.js';
 import { DriveService } from './DriveService.js';

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

@Injectable()
 export class CustomEmojiService implements OnApplicationShutdown {