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

fix middleware args resolve conflict (#282)

Browse Source
This commit is contained in:
sunxyw
2023-02-08 17:23:44 +08:00
committed by GitHub
parent 5350bbb86d
commit 8f65e5a432
3 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -75,9 +75,9 @@ class OneBot12Adapter extends ZMPlugin
}
/**
* @internal 只允许内部使用
* @param int $cid 协程 ID
* @param OneBotEvent $event 事件对象
* @internal 只允许内部使用
*/
public static function addContextPrompt(int $cid, OneBotEvent $event): void
{
@@ -85,8 +85,8 @@ class OneBot12Adapter extends ZMPlugin
}
/**
* @internal 只允许内部使用
* @param int $cid 协程 ID
* @internal 只允许内部使用
*/
public static function removeContextPrompt(int $cid): void
{
@@ -94,8 +94,8 @@ class OneBot12Adapter extends ZMPlugin
}
/**
* @internal 只允许内部使用
* @param int $cid 协程 ID
* @internal 只允许内部使用
*/
public static function isContextPromptExists(int $cid): bool
{
@@ -347,7 +347,7 @@ class OneBot12Adapter extends ZMPlugin
&& ($event->detail_type === null || $event->detail_type === $obj->detail_type);
});
try {
$handler->handleAll($obj);
$handler->handleAll();
} catch (WaitTimeoutException $e) {
// 这里是处理 prompt() 下超时的情况的
if ($e->getTimeoutPrompt() === null) {