Scarfski/dootask
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化快捷消息

Browse Source
This commit is contained in:
kuaifan
2023-03-06 09:25:19 +08:00
parent 6cf7833ef7
commit c699feef54
5 changed files with 57 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
app/Tasks/BotReceiveMsgTask.php
View File

@@ -68,9 +68,20 @@ class BotReceiveMsgTask extends AbstractTask
if ($msg->type !== 'text') {
return;
}
$pureText = trim(strip_tags($msg->msg['text']));
$original = $msg->msg['text'];
$pureText = trim(strip_tags($original));
// 签到机器人
if ($botUser->email === 'check-in@bot.system') {
if (preg_match("/<span[^>]*?data-quick-key=([\"'])(.*?)\\1[^>]*?>(.*?)<\/span>/is", $original, $match)) {
if ($match[2] === 'checkin') {
$text = "暂未开放手动签到。";
WebSocketDialogMsg::sendMsg(null, $msg->dialog_id, 'text', ['text' => $text], $botUser->userid, false, false, true); // todo 未能在任务end事件来发送任务
return;
}
}
}
// 管理机器人
if (str_starts_with($pureText, '/')) {
// 管理机器人
if ($botUser->email === 'bot-manager@bot.system') {
$isManager = true;
} elseif (UserBot::whereBotId($botUser->userid)->whereUserid($msg->userid)->exists()) {
@@ -317,8 +328,10 @@ class BotReceiveMsgTask extends AbstractTask
$text = preg_replace("/^\x20+/", "", $text);
$text = preg_replace("/\n\x20+/", "\n", $text);
WebSocketDialogMsg::sendMsg(null, $msg->dialog_id, 'text', ['text' => $text], $botUser->userid, false, false, true); // todo 未能在任务end事件来发送任务
} elseif ($pureText) {
// 推送Webhook
return;
}
// 推送Webhook
if ($pureText) {
$userBot = UserBot::whereBotId($botUser->userid)->first();
if ($userBot && preg_match("/^https*:\/\//", $userBot->webhook_url)) {
Ihttp::ihttp_post($userBot->webhook_url, [