Merge branch 'dev' of https://github.com/MaiM-with-u/MaiBot into dev

src/chat/planner_actions/action_modifier.py

@@ -70,13 +70,10 @@ class ActionModifier:
             timestamp=time.time(),
             limit=min(int(global_config.chat.max_context_size * 0.33), 10),
         )
-        # TODO: 修复！
-        from src.common.data_models import temporarily_transform_class_to_dict
-        temp_msg_list_before_now_half = [temporarily_transform_class_to_dict(msg) for msg in message_list_before_now_half]
+
         chat_content = build_readable_messages(
-            temp_msg_list_before_now_half,
+            message_list_before_now_half,
             replace_bot_name=True,
-            merge_messages=False,
             timestamp_mode="relative",
             read_mark=0.0,
             show_actions=True,

src/chat/planner_actions/planner.py

@@ -283,11 +283,8 @@ class ActionPlanner:
                 timestamp=time.time(),
                 limit=int(global_config.chat.max_context_size * 0.6),
             )
-            # TODO: 修复！
-            from src.common.data_models import temporarily_transform_class_to_dict
-            temp_msg_list_before_now = [temporarily_transform_class_to_dict(msg) for msg in message_list_before_now]
             chat_content_block, message_id_list = build_readable_messages_with_id(
-                messages=temp_msg_list_before_now,
+                messages=message_list_before_now,
                 timestamp_mode="normal_no_YMD",
                 read_mark=self.last_obs_time_mark,
                 truncate=True,