Merge branch 'main' into dev

README.md

@@ -66,9 +66,9 @@
 
 ## 💬 讨论
 
-- [一群](https://qm.qq.com/q/VQ3XZrWgMs) |
-  [四群](https://qm.qq.com/q/wGePTl1UyY) | 
-  [二群](https://qm.qq.com/q/RzmCiRtHEW) | 
+- [四群](https://qm.qq.com/q/wGePTl1UyY) |
+  [一群](https://qm.qq.com/q/VQ3XZrWgMs)(已满) | 
+  [二群](https://qm.qq.com/q/RzmCiRtHEW)(已满) | 
   [五群](https://qm.qq.com/q/JxvHZnxyec)(已满) | 
   [三群](https://qm.qq.com/q/wlH5eT8OmQ)(已满)
 

src/chat/normal_chat/normal_prompt.py

@@ -126,10 +126,9 @@ class PromptBuilder:
                 (chat_stream.user_info.platform, chat_stream.user_info.user_id) if chat_stream.user_info else None,
                 limit=global_config.normal_chat.max_context_size,
             )
-        elif chat_stream.user_info:
-            who_chat_in_group.append(
-                (chat_stream.user_info.platform, chat_stream.user_info.user_id, chat_stream.user_info.user_nickname)
-            )
+        who_chat_in_group.append(
+            (chat_stream.user_info.platform, chat_stream.user_info.user_id, chat_stream.user_info.user_nickname)
+        )
 
         relation_prompt = ""
         if global_config.relationship.enable_relationship: