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

fix BotActionResponse status filter

Browse Source
This commit is contained in:
crazywhalecc
2023-03-10 21:43:26 +08:00
committed by Jerry
parent 422b13f66f
commit b97cf26047
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ZM/Annotation/OneBot/BotActionResponse.php
View File

@@ -20,7 +20,7 @@ use ZM\Annotation\Interfaces\Level;
#[\Attribute(\Attribute::IS_REPEATABLE | \Attribute::TARGET_METHOD)] #[\Attribute(\Attribute::IS_REPEATABLE | \Attribute::TARGET_METHOD)]
class BotActionResponse extends AnnotationBase implements Level class BotActionResponse extends AnnotationBase implements Level
{ {
public function __construct(public ?int $retcode = null, public int $level = 20) public function __construct(public ?string $status = null, public ?int $retcode = null, public int $level = 20)
{ {
} }

2
src/ZM/Framework.php
View File

@@ -50,7 +50,7 @@ class Framework
public const VERSION_ID = 704; public const VERSION_ID = 704;
/** @var string 版本名称 */ /** @var string 版本名称 */
public const VERSION = '3.1.1'; public const VERSION = '3.1.2';
/** /**
* @var RuntimePreferences 运行时偏好（环境信息&参数） * @var RuntimePreferences 运行时偏好（环境信息&参数）

3
src/ZM/Plugin/OneBot/OneBot12Adapter.php
View File

@@ -427,7 +427,8 @@ class OneBot12Adapter extends ZMPlugin
// 调用 BotActionResponse 事件 // 调用 BotActionResponse 事件
$handler = new AnnotationHandler(BotActionResponse::class); $handler = new AnnotationHandler(BotActionResponse::class);
$handler->setRuleCallback(function (BotActionResponse $event) use ($resp) { $handler->setRuleCallback(function (BotActionResponse $event) use ($resp) {
return $event->retcode === null || $event->retcode === $resp->retcode; return ($event->retcode === null || $event->retcode === $resp->retcode)
&& ($event->status === null || $event->status === $resp->status);
}); });
$handler->handleAll($resp); $handler->handleAll($resp);