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

fix BotContext hasReplied bug

Browse Source
This commit is contained in:
crazywhalecc
2023-03-06 00:58:39 +08:00
committed by Jerry
parent 8285bfb827
commit 46dd439827
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/ZM/Context/BotContext.php
View File

@@ -30,9 +30,6 @@ class BotContext implements ContextInterface
/** @var array 如果是 BotCommand 匹配的上下文，这里会存放匹配到的参数 */ /** @var array 如果是 BotCommand 匹配的上下文，这里会存放匹配到的参数 */
private array $params = []; private array $params = [];
/** @var bool 用于标记当前上下文会话是否已经调用过 reply() 方法 */
private bool $replied = false;
public function __construct(string $bot_id, string $platform) public function __construct(string $bot_id, string $platform)
{ {
$this->self = ['user_id' => $bot_id, 'platform' => $platform]; $this->self = ['user_id' => $bot_id, 'platform' => $platform];
@@ -69,7 +66,7 @@ class BotContext implements ContextInterface
throw new OneBot12Exception('bot()->reply() can only be used in message event.'); throw new OneBot12Exception('bot()->reply() can only be used in message event.');
} }
$msg = (is_string($message) ? [new MessageSegment('text', ['text' => $message])] : ($message instanceof MessageSegment ? [$message] : $message)); $msg = (is_string($message) ? [new MessageSegment('text', ['text' => $message])] : ($message instanceof MessageSegment ? [$message] : $message));
$this->replied = true; container()->set('replied', true);
// 判断规则 // 判断规则
$this->matchReplyMode($reply_mode, $msg, $event); $this->matchReplyMode($reply_mode, $msg, $event);
return $this->sendMessage($msg, $event->detail_type, $event->jsonSerialize()); return $this->sendMessage($msg, $event->detail_type, $event->jsonSerialize());
@@ -148,7 +145,15 @@ class BotContext implements ContextInterface
*/ */
public function hasReplied(): bool public function hasReplied(): bool
{ {
return $this->replied; return container()->has('replied') && container()->get('replied') === true;
}
/**
* 重置当前上下文为没有被回复过
*/
public function flushReply(): void
{
container()->set('replied', false);
} }
/** /**

2
src/ZM/Framework.php
View File

@@ -47,7 +47,7 @@ class Framework
public const VERSION_ID = 702; public const VERSION_ID = 702;
/** @var string 版本名称 */ /** @var string 版本名称 */
public const VERSION = '3.1.0'; public const VERSION = '3.1.1';
/** @var array 传入的参数 */ /** @var array 传入的参数 */
protected array $argv; protected array $argv;