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

206 Commits (74ed1d3876dc3dae41e9c75ff3e035c2d580697f)

Author SHA1 Message Date
tcmofashi 33d794cd1f fix: 修复某些空值错误 2025-03-28 23:30:35 +08:00
tcmofashi 2602cbbf96 Merge branch 'main-fix' of https://github.com/SengokuCola/MaiMBot into refactor 2025-03-28 12:00:33 +08:00
tcmofashi 1fb04c0963 fix: 合并修复 2025-03-28 11:29:30 +08:00
SengokuCola 256bfcf5c2 secret:主动发言 2025-03-28 10:59:22 +08:00
tcmofashi 3eb1601982 Merge remote-tracking branch 'upstream/main-fix' into refactor 2025-03-28 10:56:47 +08:00
SengokuCola de8d2aba68 fix：优化激活值，优化logger显示 2025-03-28 09:09:30 +08:00
SengokuCola 4a72fe104a fix:ruff 2025-03-28 08:06:50 +08:00
tcmofashi c72e473934 feat: 增加平台支持的url配置 2025-03-28 04:20:45 +08:00
SengokuCola e2ae9645ef fix：兴趣值有待调整 2025-03-28 00:40:52 +08:00
SengokuCola 79e44fb69d
Merge pull request #596 from na10xi27da/relationship 
关系系统输出改进（含bug修复）
 2025-03-28 00:22:27 +08:00
SengokuCola ce254c73bc fix:修改了意愿 2025-03-28 00:18:36 +08:00
SengokuCola 6128a7f47d better:海马体2.0升级，进度 60%，炸了别怪我 2025-03-28 00:11:32 +08:00
SengokuCola b474da3875 better:海马体2.0升级-进度30% 2025-03-27 22:14:23 +08:00
SengokuCola 2812b0df3c fix:解耦海马体，莲藕促销 2025-03-27 20:07:01 +08:00
tcmofashi 3caac382a5 fix: 小修 2025-03-27 13:35:52 +08:00
tcmofashi 4c332d0b2f refactor: 初步重构为maimcore 2025-03-27 13:30:46 +08:00
meng_xi_pan bf8fea15a2 关系系统改进 2025-03-27 07:20:31 +08:00
SengokuCola 0ea57c4a58 feat 将心流功能作为 实验功能 2025-03-25 22:40:43 +08:00
SengokuCola c220f4c79e better 配置文件整理,防止眼花 
123
 2025-03-25 21:59:15 +08:00
SengokuCola 01b24d7f8c Revert "Merge branch 'think_flow_test' into main-fix" 
This reverts commit 29089d7160, reversing
changes made to d03eef21de.
 2025-03-25 17:10:28 +08:00
SengokuCola 5dea0c3a16 feat 尝试将回复意愿加入思维流 2025-03-24 23:22:03 +08:00
SengokuCola 6c9b04c1be feat 思维流大核+小核 2025-03-24 18:36:03 +08:00
SengokuCola 6da66e74f6 我要曹飞一切之thinkflow创世纪 2025-03-24 00:23:17 +08:00
SengokuCola 9f87cab148 新增思维流 2025-03-23 17:47:17 +08:00
corolin ab72ef855d 修复在接收到拍一拍消息时，由于某些原因无法获取到消息内容导致异常，且影响到正常消息的获取 
(cherry picked from commit ac466fbd366a98ba35b3c94880a67faaa95f781a)
 2025-03-22 16:40:34 +08:00
SengokuCola 7c50e33369 better 更好的logger格式 2025-03-21 16:24:28 +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
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
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
SengokuCola 8f0d13923c better 优化logger输出，清洁cmd 2025-03-19 15:27:53 +08:00
SengokuCola d7165175da fix 修复了麦麦不会回复的bug 2025-03-18 12:55:16 +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 6a325f6c57 合并 2025-03-15 20:42:12 +08:00
梦溪畔 6674854c05
Update bot.py修复每次从数据库读取额外加0.5的问题 2025-03-15 15:51:44 +08:00
AL76 ea88420ae2 refactor: 重构所有模块对于logger的初始化方式（可能不全） 2025-03-15 15:10:58 +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 6abb572125 Merge branch 'main-fix' into relationship 2025-03-15 02:37:16 +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 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
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
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 6a5316bcf8 关系计算函数迁移 2025-03-14 16:38:52 +08:00
tcmofashi b4fa12f3a1 fix: 更正了部分新增的messageCQ的初始化 2025-03-14 15:56:03 +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
HYY1116 41b6cdba86 feat:尝试增加不回答已撤回消息的功能（但似乎目前不起作用） 2025-03-13 20:44:32 +08:00
HYY1116 75f9498843 Merge branch 'debug' of https://github.com/HYY1116/MaiMBot into debug 2025-03-13 20:43:06 +08:00
HYY1116 4489952777 fix&feat:修复回应所有戳一戳的问题；尝试增加不回答已撤回消息的功能（但似乎目前不起作用） 2025-03-13 20:33:39 +08:00
ChangingSelf 5a2d133fe5 Merge branch 'debug' of github.com:ChangingSelf/MaiMBot into debug 2025-03-13 20:00:05 +08:00
ChangingSelf a718598fb6 读取戳一戳的自定义文案，并解除bot被戳时误以为用户是拿刀戳自己的误会 2025-03-13 19:58:56 +08:00
SengokuCola 31b29cb3dd Merge branch 'debug' of https://github.com/SengokuCola/MaiMBot into debug 2025-03-13 19:22:20 +08:00
SengokuCola 0b8124d883 尝试建立新的日志系统 
1
 2025-03-13 19:22:17 +08:00
ChangingSelf 831ed2b263 Merge remote-tracking branch 'upstream/debug' into debug 2025-03-13 18:55:42 +08:00
晴猫 8a992addeb
Merge pull request #274 from Pocketfans/willing_cycles 
让回复意愿更加拟人，增加高低回复意愿周期，且增加了一个简单的追问回复功能
 2025-03-13 16:02:11 +09:00
ChangingSelf 056d1537cb 修复回复非自己的戳一戳，以及识别拍一拍等文案 2025-03-13 13:10:35 +08:00
Cindy-Master f1e38e8b13 fix: ban_user_id在回复的情况下可能被绕过 2025-03-13 09:32:33 +08:00
ChangingSelf 29f0afecfa Merge branch 'debug' of github.com:ChangingSelf/MaiMBot into debug 2025-03-13 01:40:29 +08:00
ChangingSelf 4ffffb3b60 close SengokuCola/MaiMBot#246 添加戳一戳回应功能 2025-03-13 01:38:53 +08:00
Pliosauroidea eafc3dea71 修正了message变动导致的私聊error 2025-03-12 23:16:29 +08:00
HYY 8ee53fb312 fix:修复一处小bug，并且把print改为logger，减少review血压 2025-03-12 22:01:05 +08:00
Pocketfans 144475d2f4 让回复意愿更加拟人，增加高低回复意愿周期，且增加了一个简单的追问回复功能 2025-03-12 17:57:50 +08:00
UnCLAS-Prommer 6c5f56b23d 修正我修typo产生的typo 2025-03-12 17:18:39 +08:00
UnCLAS-Prommer 72754a0f2f No More Typo Please 2025-03-12 17:13:37 +08:00
Pliosauroidea 90d169f740 将价格print改为对应的logger输出 2025-03-12 07:44:57 +08:00
SengokuCola d524409c18
Merge branch 'debug' into debug 2025-03-12 00:29:59 +08:00
SengokuCola ed18f2e96d 新增了知识库一键启动漂亮脚本 2025-03-11 23:46:49 +08:00
Pliosauroidea cd16e68223 修复表情包发送时的缺失参数 2025-03-11 22:47:20 +08:00
Pliosauroidea 3c8c8977e6 屏蔽一个臃肿的debug信息 2025-03-11 22:11:10 +08:00
Pliosauroidea 9d0152a2b2 修复了合并过程中造成的代码重复 2025-03-11 21:41:36 +08:00
Pliosauroidea 956135cad9 添加一些注释 2025-03-11 21:23:07 +08:00
Pliosauroidea a41274156b 将print变为logger.debug 2025-03-11 21:14:32 +08:00
Pliosauroidea 3180426727 修复了没有改掉的typo字段 2025-03-11 21:08:19 +08:00
Pliosauroidea aea3bffd99 添加私聊过滤开关,更新config,增加约束 2025-03-11 20:55:54 +08:00
Pliosauroidea baed8560fb 修正了私聊屏蔽词输出 2025-03-11 20:48:11 +08:00
Pliosauroidea 5aeafca756 Merge branch 'debug' of https://github.com/Pliosauroidea/MaiMBot into debug 2025-03-11 20:45:12 +08:00
Pliosauroidea 33cd83b895 添加私聊功能 2025-03-11 20:01:38 +08:00
tcmofashi b19902919e Merge remote-tracking branch 'upstream/debug' into refractor 2025-03-11 19:51:03 +08:00
tcmofashi ef8691cd9e fix: 修改message继承逻辑，修复回复消息无法识别 2025-03-11 19:30:20 +08:00
八分橘子 e1019ade3c fix: 修复变量拼写错误并优化代码可读性 2025-03-11 18:52:32 +08:00
八分橘子 bfa9a3c026 fix: 添加群信息获取的错误处理 (#173) 2025-03-11 18:40:03 +08:00
SengokuCola af962c2e84 修复了情绪管理器没有正确导入导致发布出消息 
1
 2025-03-11 16:50:40 +08:00
Rikki 67f6d7cd42 fix: 保证能运行的小修改 2025-03-11 06:54:04 +08:00
Rikki 0cf4ff0a4d Merge remote-tracking branch 'upstream/debug' into tc_refractor 2025-03-11 06:01:54 +08:00
Rikki a54ca8ce18 Merge remote-tracking branch 'upstream/debug' into feat_regix 2025-03-11 05:05:07 +08:00
tcmofashi 8cbf9bb048 feat: 史上最好的消息流重构和图片管理 2025-03-11 04:42:24 +08:00