From c8a19e5f7ba9f8486abc034b272c1d966947ea52 Mon Sep 17 00:00:00 2001 From: hellcat <> Date: Mon, 7 Apr 2025 21:56:04 +0800 Subject: [PATCH] no message --- public/tests/hook.php | 2 +- src/Controllers/TomApi/Tg/HookController.php | 16 +++++++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/public/tests/hook.php b/public/tests/hook.php index edfcf4b0..b5363460 100644 --- a/public/tests/hook.php +++ b/public/tests/hook.php @@ -35,7 +35,7 @@ $oHttp->aData = [ 'type' => 'private' ], 'date' => 1610000000, - "text" => "\/nodeLike#name 日本 JP-", + "text" => "\/nodeLike#name#type1 m1", ] ]; diff --git a/src/Controllers/TomApi/Tg/HookController.php b/src/Controllers/TomApi/Tg/HookController.php index 5f9c8a69..2fb82075 100755 --- a/src/Controllers/TomApi/Tg/HookController.php +++ b/src/Controllers/TomApi/Tg/HookController.php @@ -730,12 +730,12 @@ final class HookController } // 节点搜索 - // /nodeLike_duck jp02 + // /nodeLike_duck_type1 jp02 if (strpos($sText, '/nodeLike') === 0 || strpos($sText, '\/nodeLike') === 0) { - list($sCmd, $sLike) = explode(" ", $sText, 2); + @list($sCmd, $sLike) = explode(" ", $sText); - list(, $sField) = explode("#", $sCmd, 2); + @list(, $sField, $sMod) = explode("#", $sCmd, 3); switch ($sField) { case "port": @@ -759,7 +759,13 @@ final class HookController try { - $aNodeList = Node::where($sField, 'like', '%' . $sLike . '%')->orderBy('type', 'desc')->orderBy('name', 'asc')->get()->toArray(); + $oNodeList = Node::where($sField, 'like', '%' . $sLike . '%'); + + if ($sMod == 'type1') { + $oNodeList->where('type', 1); + } + + $aNodeList = $oNodeList->orderBy('type', 'desc')->orderBy('name', 'asc')->get()->toArray(); } catch (\Illuminate\Database\QueryException $e) { @@ -796,7 +802,7 @@ final class HookController } // $sMsg = json_encode($aNodeListNew, JSON_UNESCAPED_UNICODE | JSON_PRETTY_PRINT); - Http::response(200, 'ok'); +// Http::response(200, 'ok'); } $this->sendMessage($sMsg);