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

update to 1.2 version

Browse Source 
Generate systemd script
Default info_level set to 2
Modify & add some comment for Example module
Brand new Console
Add daemon command argument
Add #OnTick annotation
Add ZMRobot API class
This commit is contained in:
whale
2020-04-29 15:29:56 +08:00
parent e1983d6dd8
commit 169a751e0f
31 changed files with 872 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/ZM/API/CQ.php
View File

@@ -18,7 +18,7 @@ class CQ
if (is_numeric($qq) || $qq === "all") {
return "[CQ:at,qq=" . $qq . "]";
}
Console::error("传入的QQ号码($qq)错误！");
Console::warning("传入的QQ号码($qq)错误！");
return " ";
}
@@ -31,7 +31,7 @@ class CQ
if (is_numeric($id)) {
return "[CQ:face,id=" . $id . "]";
}
Console::error("传入的face id($id)错误！");
Console::warning("传入的face id($id)错误！");
return " ";
}
@@ -44,7 +44,7 @@ class CQ
if (is_numeric($id)) {
return "[CQ:emoji,id=" . $id . "]";
}
Console::error("传入的emoji id($id)错误！");
Console::warning("传入的emoji id($id)错误！");
return " ";
}
@@ -66,7 +66,7 @@ class CQ
if (is_numeric($id)) {
return "[CQ:sface,id=" . $id . "]";
}
Console::error("传入的sface id($id)错误！");
Console::warning("传入的sface id($id)错误！");
return " ";
}
@@ -151,7 +151,7 @@ class CQ
return "[CQ:music,type=$type,id=$id_or_url]";
case "custom":
if ($title === null || $audio === null) {
Console::error("传入CQ码实例的标题和音频链接不能为空！");
Console::warning("传入CQ码实例的标题和音频链接不能为空！");
return " ";
}
if ($content === null) $c = "";
@@ -160,7 +160,7 @@ class CQ
else $i = ",image=" . $image;
return "[CQ:music,type=custom,url=" . $id_or_url . ",audio=" . $audio . ",title=" . $title . $c . $i . "]";
default:
Console::error("传入的music type($type)错误！");
Console::warning("传入的music type($type)错误！");
return " ";
}
}
@@ -217,4 +217,4 @@ class CQ
}
return $msg;
}
}
}

13
src/ZM/API/CQAPI.php
View File

@@ -93,12 +93,12 @@ class CQAPI
}
}
if ($find === null) {
Console::error("Unknown API " . $name);
Console::warning("Unknown API " . $name);
return false;
}
$reply = ["action" => $find];
if (!is_array($arg[1])) {
Console::error("Error when parsing params. Please make sure your params is an array.");
Console::warning("Error when parsing params. Please make sure your params is an array.");
return false;
}
if ($arg[1] != []) {
@@ -107,7 +107,7 @@ class CQAPI
if (!($arg[0] instanceof CQConnection)) {
$robot = ConnectionManager::getByType("qq", ["self_id" => $arg[0]]);
if ($robot == []) {
Console::error("发送错误，机器人连接不存在！");
Console::warning("发送错误，机器人连接不存在！");
return false;
}
$arg[0] = $robot[0];
@@ -195,7 +195,7 @@ class CQAPI
* @param |null $function
* @return bool
*/
private static function processAPI($connection, $reply, $function = null) {
public static function processAPI($connection, $reply, $function = null) {
$api_id = ZMBuf::$atomics["wait_msg_id"]->get();
$reply["echo"] = $api_id;
ZMBuf::$atomics["wait_msg_id"]->add(1);
@@ -222,7 +222,7 @@ class CQAPI
]);
}
if ($connection->push(json_encode($reply))) {
Console::msg($reply, $connection->getQQ());
//Console::msg($reply, $connection->getQQ());
ZMBuf::$atomics["out_count"]->add(1);
if ($function === true) {
Co::suspend();
@@ -232,6 +232,7 @@ class CQAPI
}
return true;
} else {
Console::warning("CQAPI send failed, websocket push error.");
$response = [
"status" => "failed",
"retcode" => 999,
@@ -246,4 +247,4 @@ class CQAPI
return false;
}
}
}
}