merge: sync upstream/r-dev and resolve real conflicts

2026-03-24 15:36:26 +08:00
parent 308448171c 2c279f703c
commit ded5a7478d
114 changed files with 15841 additions and 5236 deletions
--- a/src/main.py
+++ b/src/main.py
@@ -5,7 +5,7 @@ from typing import TYPE_CHECKING
 import asyncio
 import time

-from src.bw_learner.expression_auto_check_task import ExpressionAutoCheckTask
+from src.learners.expression_auto_check_task import ExpressionAutoCheckTask
 from src.chat.emoji_system.emoji_manager import emoji_manager
 from src.chat.message_receive.bot import chat_bot
 from src.chat.message_receive.chat_manager import chat_manager