BruceSun
/
MaiBot
mirror of https://github.com/Mai-with-u/MaiBot.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,231 Commits
5 Branches
29 Tags
70 MiB
Commit Graph

466 Commits (d9b4536969a99e53ca24c279a561b6940be1f311)

Author SHA1 Message Date
SengokuCola a7278a37c7 better cmd清理大师 2025-03-21 17:59:13 +08:00
SengokuCola a47266abd2 better 更好的llm使用统计 2025-03-21 17:44:18 +08:00
SengokuCola 341ab99770 fix 移除/n 2025-03-21 16:59:46 +08:00
SengokuCola 7c50e33369 better 更好的logger格式 2025-03-21 16:24:28 +08:00
SengokuCola 432104f582 fix 修正格式防止曹飞 2025-03-21 14:49:59 +08:00
SengokuCola 96637a4088 Merge branch 'main-fix' of https://github.com/MaiM-with-u/MaiBot into main-fix 2025-03-21 14:40:54 +08:00
SengokuCola 6c3afa84c4 better 更好的记忆抽取策略，并且移除了无用选项 2025-03-21 14:37:19 +08:00
春河晴 7cad7786cc
style: 代码格式化，修复缩进问题 
🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>
 2025-03-21 13:41:43 +08:00
Bakadax 554464315f
Merge branch 'main-fix' into main-fix 2025-03-21 14:31:10 +09:00
SengokuCola 90f6c1d1d0
Merge pull request #515 from tcmofashi/main-fix 
fix: 增强表情包扫描时的稳定性
 2025-03-21 08:13:26 +08:00
UnCLAS-Prommer e5d923189a
Merge branch 'MaiM-with-u:main-fix' into main-fix 2025-03-21 01:12:59 +08:00
tcmofashi 9066abd09a Merge remote-tracking branch 'upstream/main-fix' into main-fix 2025-03-21 00:31:06 +08:00
tcmofashi b7d7a9b2db fix: 修复了filename重复 2025-03-21 00:30:47 +08:00
Maple127667 255552525e 紧急修复-对于转发消息的黑白名单判断 2025-03-20 22:46:21 +08:00
Maple127667 e54f81cf00 bug-fix 2025-03-20 18:26:13 +08:00
Maple127667 dab0755e12 多层聊天记录转发解析 
支持解析多层聊天记录，不（也不应该）支持聊天记录内图片解析
 2025-03-20 18:17:20 +08:00
UnCLAS-Prommer a973057579 完成其他部分对返回值处理的修改 2025-03-20 17:08:53 +08:00
UnCLAS-Prommer e9bd3196ba 正确保存模型名称到Database 2025-03-20 16:47:50 +08:00
Maple127667 0b0bfdb48d bug-fix 2025-03-19 21:25:53 +08:00
Maple127667 e0d766611b 合并转发消息处理 
增加了合并转发消息的处理，目前可以处理简单的合并转发，暂不支持嵌套转发，不支持转发内图片识别（我觉得转发内图片不该识别
 2025-03-19 21:21:57 +08:00
春河晴 fdc098d0db
优化代码格式和异常处理 
- 修复异常处理链，使用from语法保留原始异常
- 格式化代码以符合项目规范
- 优化导入模块的顺序

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>
 2025-03-19 20:27:34 +09:00
dax 65c26af25b modified: src/plugins/chat/utils.py 2025-03-19 18:54:02 +08:00
SengokuCola c8b357bcac Merge branch 'main-fix' of https://github.com/MaiM-with-u/MaiBot into main-fix 2025-03-19 15:28:30 +08:00
SengokuCola 8f0d13923c better 优化logger输出，清洁cmd 2025-03-19 15:27:53 +08:00
SengokuCola 1076b509a3 secret 神秘小功能 2025-03-19 15:22:34 +08:00
SengokuCola b187c8a21b better 稍微优化了一下记忆prompt 2025-03-19 14:44:46 +08:00
SengokuCola b97d62d365 fix 使麦麦更友善 2025-03-19 14:39:15 +08:00
SengokuCola a4236c585b fix prompt优化 2025-03-19 14:38:03 +08:00
dax 61007ffc5e 修复西文字符句子错误分割的bug 2025-03-19 10:28:07 +08:00
dax 50d22399e0 修复西文字符错误分行问题 2025-03-19 10:15:12 +08:00
Bakadax 4e73f66dce
修复西文字符句子错误分行的问题 2025-03-19 10:08:38 +08:00
SengokuCola 2da2769e44
Merge pull request #473 from Ark-Hakobune/main-fix 
颜文字分割问题fix
 2025-03-18 17:57:31 +08:00
SengokuCola d7165175da fix 修复了麦麦不会回复的bug 2025-03-18 12:55:16 +08:00
SengokuCola 39e07b42d0 fix msg 2025-03-18 10:26:13 +08:00
Ark-Hakobune 9ed115dd15 Merge remote-tracking branch 'upstream/main-fix' into main-fix 2025-03-18 10:07:52 +08:00
SengokuCola 5b875f087b fix 改了一部分logger格式 2025-03-18 09:59:58 +08:00
Ark-Hakobune 300a0d4129 颜文字分割问题修正 2025-03-17 22:51:21 +08:00
SengokuCola 4bf6f1e204
Merge pull request #441 from Maple127667/main-fix 
token统计部分
 2025-03-17 17:23:18 +08:00
晴猫 6611d9b46d
Merge pull request #398 from na10xi27da/relationship 
关系系统构建与启用（非紧急）
 2025-03-17 17:21:48 +08:00
SengokuCola 665ef54cdd 更新remote项，使其真正有作用，更新config到0.0.10 2025-03-17 11:53:57 +08:00
Maple127667 4bc222ba6f token统计部分 2025-03-16 23:11:32 +08:00
meng_xi_pan a6ee45cbf5 一点错误 2025-03-16 18:06:25 +08:00
meng_xi_pan 815f4d473b 调整成函数 2025-03-16 17:55:11 +08:00
meng_xi_pan 220cb1b948 Merge branch 'main-fix' into relationship 2025-03-16 17:40:13 +08:00
UnCLAS-Prommer b706a0de8d 截断log，出于日志可读性考虑 2025-03-16 10:21:47 +08:00
meng_xi_pan 0c486ce90e 最后一次合并大概 2025-03-15 22:36:55 +08:00
meng_xi_pan e0377ab4c8 Merge branch 'main-fix' into relationship 2025-03-15 22:21:12 +08:00
meng_xi_pan 54cf0bfbf3 删除奇怪的东西 2025-03-15 22:04:02 +08:00
tcmofashi 27366a1005
Merge pull request #401 from SaigyoujiYusora/prompt-update 
Prompt 增强
 2025-03-15 21:38:23 +08:00
meng_xi_pan 6a325f6c57 合并 2025-03-15 20:42:12 +08:00
梦溪畔 ca29583ce1
Update prompt_builder.py忘删logger了 2025-03-15 20:11:30 +08:00
梦溪畔 4880ee07e0
Update prompt_builder.py调整prompt结构 2025-03-15 20:01:25 +08:00
Pliosauroidea 1e0abb0a9b 修复了对reply的解析 2025-03-15 19:29:46 +08:00
Pliosauroidea 24e150c64e 修复拿不到at对象的问题 2025-03-15 19:29:46 +08:00
梦溪畔 e5fb1d88fb
Update prompt_builder.py减弱提示词 2025-03-15 16:24:49 +08:00
梦溪畔 6674854c05
Update bot.py修复每次从数据库读取额外加0.5的问题 2025-03-15 15:51:44 +08:00
梦溪畔 39170079c3
Update relationship_manager.py 2025-03-15 15:41:27 +08:00
AL76 924e9994ed refactor: 重构漏掉的模块对于logger的初始化方式（可能不全） 2025-03-15 15:20:42 +08:00
AL76 ea88420ae2 refactor: 重构所有模块对于logger的初始化方式（可能不全） 2025-03-15 15:10:58 +08:00
SengokuCola ff5a5719cd Merge branch 'main-fix' of https://github.com/SengokuCola/MaiMBot into main-fix 2025-03-15 12:30:05 +08:00
SengokuCola b2096debf4 修复输出 新增eula, 修复自动版本升级 2025-03-15 12:30:01 +08:00
KawaiiYusora c3bb45caa0
✨ refactor(prompt_builder): 历史遗留问题 2025-03-15 04:18:19 +08:00
meng_xi_pan 4644e93385 prompt小修改 2025-03-15 03:31:20 +08:00
Oct-autumn 1d36fd6aaf
Merge branch 'main-fix' of github.com:SengokuCola/MaiMBot into main-fix-friendtalk 2025-03-15 03:06:50 +08:00
meng_xi_pan 0c8488e4cb 删除调试 2025-03-15 02:49:52 +08:00
meng_xi_pan 6abb572125 Merge branch 'main-fix' into relationship 2025-03-15 02:37:16 +08:00
meng_xi_pan 41b0582180 修补 2025-03-15 02:30:09 +08:00
KawaiiYusora bafb39b0f1
✨ refactor(prompt_builder): 击毙还没用的读空气 2025-03-15 02:20:08 +08:00
KawaiiYusora 5559a59c0e
Merge branch 'main-fix' of https://github.com/SengokuCola/MaiMBot into prompt-update 
# Conflicts:
#	src/plugins/chat/prompt_builder.py
 2025-03-15 02:13:13 +08:00
KawaiiYusora 8f9a3f786d
✨ refactor(prompt_builder): 增强防注入能力。从理论角度提升了部分防御能力 2025-03-15 02:06:40 +08:00
SengokuCola b31223dec6
Merge pull request #377 from Oct-autumn/main-fix-poke 
fix&refactor: 修复“戳一戳”功能的处理逻辑漏洞，重构部分代码以提高代码复用率
 2025-03-15 00:58:02 +08:00
meng_xi_pan 1e1ac07713 合并 2025-03-14 23:49:37 +08:00
meng_xi_pan 642ff138a8 Merge branch 'main-fix' into relationship 2025-03-14 23:47:33 +08:00
SengokuCola dc054d456b 修改了willing的classical 2025-03-14 23:45:28 +08:00
meng_xi_pan fcd9413beb 添加一点注释 2025-03-14 23:42:48 +08:00
Oct-autumn c4a7b61ce9
Merge branch 'main-fix-poke' of github.com:Oct-autumn/MaiMBot into main-fix-poke 2025-03-14 21:56:36 +08:00
KawaiiYusora f03d27665f
✨ refactor(chat/prompt_builder.py): 重构提示生成逻辑，优化代码结构，移除冗余代码 2025-03-14 21:54:38 +08:00
Oct-autumn 4786842865
refactor: 重构“戳一戳”与需要考虑回复的消息的处理逻辑 
- 将handle_message函数中的消息实例处理部分提取出来，形成message_process函数（提高代码复用率）
  - 将“戳一戳”的通知处理为一条通用消息实例，交由message_process函数处理
  - 同时，由于使用了通用消息实例，“戳一戳”的处理逻辑将与其他消息处理统一经过群组权限鉴别
 2025-03-14 21:51:03 +08:00
SengokuCola c0f9298517 调参仙人有福了，添加了willing_manager的自选功能 2025-03-14 21:34:52 +08:00
Oct-autumn 661932403f
fix: 修复私聊时引用消息和撤回消息时发生报错的bug 2025-03-14 19:59:54 +08:00
meng_xi_pan 3d1a58130d Merge branch 'main-fix' into relationship 2025-03-14 18:52:13 +08:00
Bakadax aee5fa7603
Update message.py 2025-03-14 17:58:14 +08:00
Oct_Autumn 5078245f1d
Merge branch 'main-fix' into main-fix-poke 2025-03-14 17:54:47 +08:00
SengokuCola 08499f747d
Merge pull request #383 from SengokuCola/refactor 
Refactor
 2025-03-14 17:49:27 +08:00
meng_xi_pan a3927507dc 关系系统大致完善 2025-03-14 17:47:33 +08:00
UnCLAS-Prommer e00b3ae09c 优雅的新logger! 2025-03-14 17:25:59 +08:00
meng_xi_pan 414340588d 迁移2 2025-03-14 16:47:31 +08:00
meng_xi_pan 6a5316bcf8 关系计算函数迁移 2025-03-14 16:38:52 +08:00
tcmofashi b4fa12f3a1 fix: 更正了部分新增的messageCQ的初始化 2025-03-14 15:56:03 +08:00
tcmofashi f2b8ec4b13 fix: 找回embedding 2025-03-14 15:52:19 +08:00
tcmofashi 374b64165f Merge remote-tracking branch 'upstream/main-fix' into main-fix 2025-03-14 15:41:25 +08:00
tcmofashi d3fe02e467 fix: 增大了默认的maxtoken防止溢出，messagecq改异步get_image防止阻塞 2025-03-14 15:38:33 +08:00
Oct-autumn 5be793a054
refactor: 重构“戳一戳”与需要考虑回复的消息的处理逻辑 
- 将handle_message函数中的消息实例处理部分提取出来，形成message_process函数（提高代码复用率）
  - 将“戳一戳”的通知处理为一条通用消息实例，交由message_process函数处理
  - 同时，由于使用了通用消息实例，“戳一戳”的处理逻辑将与其他消息处理统一经过群组权限鉴别
 2025-03-14 15:32:10 +08:00
SengokuCola c23f60f518
Merge pull request #376 from SengokuCola/refactor 
Refactor
 2025-03-14 15:06:30 +08:00
tcmofashi e2c5d42634 add self 2025-03-14 14:17:09 +08:00
tcmofashi 3e05f03ddf fix: fix reply 2025-03-14 14:05:28 +08:00
Oct-autumn 33df5981b4
fix: 构建记忆时重复读取同一段消息，导致token消耗暴增 2025-03-14 13:37:23 +08:00
HYY e58f9c646c
feat:尝试增加不回答已撤回消息的功能，并每小时删除一次存留超过1小时的撤回消息 
feat:尝试增加不回答已撤回消息的功能，并每小时删除一次存留超过1小时的撤回消息
 2025-03-14 09:34:22 +08:00
tcmofashi de94c754f5
Merge pull request #340 from RBAmeto/patch-1 
修复回复消息没有正常发送的问题
 2025-03-14 01:53:29 +08:00
RBAmeto 93fb541601
set_reply bug 2025-03-14 01:31:22 +08:00