zhamao-robot/zhamao-framework
1
0
Fork 0
mirror of https://github.com/zhamao-robot/zhamao-framework.git synced 2026-07-23 08:35:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix BotCommand prefix bug

Browse Source
This commit is contained in:
crazywhalecc
2022-12-31 19:11:39 +08:00
parent d32f7b0ff8
commit dce126136b
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/ZM/Plugin/OneBot12Adapter.php
View File

@@ -365,12 +365,12 @@ class OneBot12Adapter extends ZMPlugin
continue; continue;
} }
// 测试 match // 测试 match
if ($v->match !== '' && $v->match === $head) { if ($v->match !== '' && ($v->prefix . $v->match) === $head) {
array_shift($cmd_explode); array_shift($cmd_explode);
return [$v, $cmd_explode, $full_str]; return [$v, $cmd_explode, $full_str];
} }
// 测试 alias // 测试 alias
if ($v->match !== '' && $v->alias !== [] && in_array($head, $v->alias, true)) { if ($v->match !== '' && $v->alias !== [] && in_array($head, array_map(fn ($x) => $v->prefix . $x, $v->alias), true)) {
array_shift($cmd_explode); array_shift($cmd_explode);
return [$v, $cmd_explode, $full_str]; return [$v, $cmd_explode, $full_str];
} }
@@ -610,7 +610,7 @@ class OneBot12Adapter extends ZMPlugin
{ {
$handler = new AnnotationHandler(BotCommand::class); $handler = new AnnotationHandler(BotCommand::class);
$handler->setReturnCallback(function ($result) use ($ctx) { $handler->setReturnCallback(function ($result) use ($ctx) {
if (is_string($result)) { if (is_string($result) || $result instanceof MessageSegment) {
$ctx->reply($result); $ctx->reply($result);
return; return;
} }