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

enhancement for BotCommand and CommandArgument

Browse Source
This commit is contained in:
crazywhalecc
2022-12-26 03:19:53 +08:00
parent 73151db726
commit efda3f4408
10 changed files with 625 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/ZM/Annotation/OneBot/BotCommand.php
View File

@@ -28,34 +28,32 @@ class BotCommand extends AnnotationBase implements Level
* @param string[] $alias
*/
public function __construct(
public $name = '',
public $match = '',
public $pattern = '',
public $regex = '',
public $start_with = '',
public $end_with = '',
public $keyword = '',
public $alias = [],
public $detail_type = '',
public $user_id = '',
public $group_id = '',
public $level = 20
public string $name = '',
public string $match = '',
public string $pattern = '',
public string $regex = '',
public string $start_with = '',
public string $end_with = '',
public string $keyword = '',
public array $alias = [],
public string $detail_type = '',
public string $prefix = '',
public int $level = 20
) {
}
public static function make(
$name = '',
$match = '',
$pattern = '',
$regex = '',
$start_with = '',
$end_with = '',
$keyword = '',
$alias = [],
$message_type = '',
$user_id = '',
$group_id = '',
$level = 20
string $name = '',
string $match = '',
string $pattern = '',
string $regex = '',
string $start_with = '',
string $end_with = '',
string $keyword = '',
array $alias = [],
string $detail_type = '',
string $prefix = '',
int $level = 20
): BotCommand {
return new static(...func_get_args());
}

21
src/ZM/Annotation/OneBot/CommandArgument.php
View File

@@ -23,13 +23,14 @@ class CommandArgument extends AnnotationBase implements ErgodicAnnotation
public string $type = 'string';
/**
* @param string $name 参数名称（可以是中文）
* @param string $description 参数描述（默认为空）
* @param bool $required 参数是否必需，如果是必需，为true（默认为false）
* @param string $prompt 当参数为必需且缺失时，返回给用户的提示输入的消息（默认为"请输入$name"）
* @param string $default 当required为false时，未匹配到参数将自动使用default值（默认为空）
* @param int $timeout prompt超时时间（默认为60秒）
* @throws InvalidArgumentException|ZMKnownException
* @param string $name 参数名称（可以是中文）
* @param string $description 参数描述（默认为空）
* @param bool $required 参数是否必需，如果是必需，为true（默认为false）
* @param string $prompt 当参数为必需且缺失时，返回给用户的提示输入的消息（默认为"请输入$name"）
* @param null|array|\Closure|float|int|string $default 当required为false时，未匹配到参数将自动使用default值（默认为空）
* @param int $timeout prompt超时时间（默认为60秒）
* @throws InvalidArgumentException
* @throws ZMKnownException
*/
public function __construct(
/**
@@ -40,7 +41,7 @@ class CommandArgument extends AnnotationBase implements ErgodicAnnotation
string $type = 'string',
public bool $required = false,
public string $prompt = '',
public string $default = '',
public string|\Closure|array|int|float|null $default = '',
public int $timeout = 60,
public int $error_prompt_policy = 1
) {
@@ -97,6 +98,10 @@ class CommandArgument extends AnnotationBase implements ErgodicAnnotation
if (array_key_exists($type, $table)) {
return $table[$type];
}
// 说明是自定义类型
if (mb_strpos($type, '.') === 0 && mb_strlen($type) >= 2) {
return $type;
}
throw new ZMKnownException(zm_internal_errcode('E00077') . 'Invalid argument type: ' . $type . ', only support any, string, number and bool !');
}
}