From 9dd211f3b5d39822b2ee9318e0b7f58c57ed37ad Mon Sep 17 00:00:00 2001
From: hellcat <>
Date: Tue, 17 Jun 2025 14:50:37 +0800
Subject: [PATCH] no message

---
 .../Controllers/Api/TG/HookController.php     |  4 +-
 app/Http/Controllers/SakaiController.php      | 13 ++++++
 app/Services/TG/Hook/Mod/Dove.php             | 42 +++++++++++++------
 3 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/app/Http/Controllers/Api/TG/HookController.php b/app/Http/Controllers/Api/TG/HookController.php
index d596cfd0..9d2c4fd4 100755
--- a/app/Http/Controllers/Api/TG/HookController.php
+++ b/app/Http/Controllers/Api/TG/HookController.php
@@ -65,8 +65,8 @@ final class HookController
 //                $sClass = $sHook;
 //                $sFunc = "go";
 //            } else {
-                $sClass = $aCmd[0];
-                $sFunc = $aCmd[1];
+                $sClass = $aCmd[0] ?? false;
+                $sFunc = $aCmd[1] ?? false;
 //            }
         
         if (strpos($sClass, "dove%") !== false) {
diff --git a/app/Http/Controllers/SakaiController.php b/app/Http/Controllers/SakaiController.php
index 82219fdc..978a420b 100755
--- a/app/Http/Controllers/SakaiController.php
+++ b/app/Http/Controllers/SakaiController.php
@@ -336,6 +336,19 @@ class SakaiController
         
         $s = "openRe";
         $s = "memo__2 xxxx";
+        
+        $s = "/dove#list";
+//        $s = "/dove#now";
+//        $s = "/dove#uncheck 15";
+        $s = "/dove#check cfn";
+        $s = "/dove%zzz";
+        $s = "/dove%cmd#list";
+        
+        
+        
+        
+        
+        
 //        $s = "toWait 333333";
 //        $s = "no 2";
 //        
diff --git a/app/Services/TG/Hook/Mod/Dove.php b/app/Services/TG/Hook/Mod/Dove.php
index d668742a..a4e0931b 100644
--- a/app/Services/TG/Hook/Mod/Dove.php
+++ b/app/Services/TG/Hook/Mod/Dove.php
@@ -11,11 +11,13 @@ class Dove extends Base {
     public function go($aParam, $aData)
     {
         $oDoveSiteCheckedList = ModelDoveSite::where("dove_checked", 1)->get();
-
+//tomd($aData, 1);
         list(, $sSubCmd) = explode("%", $aData['message']['text'], 2);
 
         $aData['message']['text'] = $sSubCmd;
         
+        $aData['is_dove'] = 1;
+        
         $aData['dove_token'] = env('dove_token');
         
         $oHttp = new Http();
@@ -27,14 +29,22 @@ class Dove extends Base {
             $oHttp->sToUrl = $sApiUrl;
             $oHttp->aData = $aData;
             $r[] = $oHttp->send();
-            
         }
         
         return $r;
         
     }
     
-    public function set($aParam)
+    public function list()
+    {
+        $oDove = ModelDoveSite::all();
+        
+        $r = $this->toJson($oDove);
+        
+        return $r;
+    }
+    
+    public function check($aParam)
     {
         $iSetValue = $aParam['iSetValue'] ?? 1;
         $sCode = $aParam['aArg'][1];
@@ -58,12 +68,12 @@ class Dove extends Base {
         return $r;
     }
     
-    public function unsetAll()
+    public function uncheck()
     {
         
         $r = ModelDoveSite::query()->update(["dove_checked" => 0]);
         
-        return $r;
+        return $this->now();
     }
     
     public function unset($aParam)
@@ -78,16 +88,22 @@ class Dove extends Base {
     {
         $aDoveSiteNow = ModelDoveSite::where("dove_checked", 1)->get()->toArray();
         
-        if ($aDoveSiteNow) {
-            $r = "";
-            foreach ($aDoveSiteNow as $row) {
-                $r .= "\n";
-                $r .= $row['code']."::".$row['www']."::".$row['class'];
-            }
-        } else {
-            $r = "没有";
+//        if ($aDoveSiteNow) {
+//            $r = "";
+//            foreach ($aDoveSiteNow as $row) {
+//                $r .= "\n";
+//                $r .= $row['code']."::".$row['www']."::".$row['class'];
+//            }
+//        } else {
+//            $r = "没有";
+//        }
+        
+        if (!$aDoveSiteNow) {
+            return "没有";
         }
         
+        $r = $this->toJson($aDoveSiteNow);
+        
         return $r;
     }