Merge branch 'main' into dev

pull/1067/head
墨梓柒 2025-06-28 20:43:28 +08:00 committed by GitHub
commit 8d1f31ce7d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 7 deletions

View File

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

View File

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