From fee656d40ab9a23d1d53b960010f0ac20aa253f1 Mon Sep 17 00:00:00 2001
From: hellcat <>
Date: Sat, 10 May 2025 13:33:39 +0800
Subject: [PATCH] no message

---
 app/Http/Controllers/SakaiController.php |  7 ++-
 app/Models/NoteOption.php                | 27 ++++++++++
 app/Services/TG/Hook/Mod/Note.php        | 52 +++++++++++++------
 app/Services/TG/Hook/Mod/note_option.php | 64 +++++++++++++++++++++++-
 4 files changed, 134 insertions(+), 16 deletions(-)

diff --git a/app/Http/Controllers/SakaiController.php b/app/Http/Controllers/SakaiController.php
index ce9b862f..ee06a62a 100755
--- a/app/Http/Controllers/SakaiController.php
+++ b/app/Http/Controllers/SakaiController.php
@@ -68,7 +68,12 @@ class SakaiController
 //        $s = "/note#memo__1 股您吗的";
 //        $s = "/note#icon";
         $s = "/note#add__now 脱裤子 112";
-        $s = "/note_option#add__ttt zzz";
+//        $s = "/note_option#add__ttt1 zzz";
+//        $s = "/note_option#del ttt";
+        $s = "/note_option#list";
+        $s = "/note_option#find icon_type1";
+        $s = "/note_option#set__icon_type 2";
+        $s = "/note#main";
         
         $oHttp = new Http();
         $oHttp->sMethod = "post";
diff --git a/app/Models/NoteOption.php b/app/Models/NoteOption.php
index 4d5e0f41..20575589 100755
--- a/app/Models/NoteOption.php
+++ b/app/Models/NoteOption.php
@@ -8,4 +8,31 @@ class NoteOption extends Model
 {
     protected $table = 'note_option';
     public $timestamps = false;
+    
+    public static function _find($sKey)
+    {
+        $aData = self::where("key", $sKey)->first()->toArray();
+        
+        if ($aData["value"]) {
+            $r = $aData["value"];
+        } else {
+            $r = false;
+        }
+        
+        return $r;
+        
+    }
+    
+    public static function _all()
+    {
+        $aData = self::all()->toArray();
+        
+        $aDataNew = [];
+        foreach ($aData as $row) {
+            $aDataNew[$row["key"]] = $row["value"];
+        }
+        
+        return $aDataNew;
+    }
+    
 }
diff --git a/app/Services/TG/Hook/Mod/Note.php b/app/Services/TG/Hook/Mod/Note.php
index 6cd233d1..c733e936 100644
--- a/app/Services/TG/Hook/Mod/Note.php
+++ b/app/Services/TG/Hook/Mod/Note.php
@@ -3,9 +3,17 @@
 namespace App\Services\TG\Hook\Mod;
 
 use App\Models\Note as ModelNote;
+use App\Models\NoteOption as ModelNoteOption;
 
 class Note extends Base {
     
+    private $sIconType;
+    
+    function __construct()
+    {
+        $this->sIconType = ModelNoteOption::_find("icon_type");
+    }
+    
     public function Score($aParam)
     {
         
@@ -185,7 +193,9 @@ class Note extends Base {
     
     private function arrTypeIcon()
     {
-        $aMap = [
+        $aMap = [];
+        
+        $aMap[1] = [
             "warning"   => "🟥",
             "now"   => "🟩",
             "wait"  => "🟧",
@@ -198,23 +208,37 @@ class Note extends Base {
             "tip"   => "💡",
         ];
         
-        return $aMap;
+        $aMap[2] = [
+            "warning"   => "🔴",
+            "now"   => "🟢",
+            "wait"  => "🟠",
+            "under" => "⚪️",
+            "keep"  => "⚫️",
+            "del"   => "❌",
+            "track" => "🟤",
+            "mark"  => "🟣",
+            "done"  => "✅",
+            "tip"   => "💡",
+        ];
+        
+        $aMap[3] = [
+            "warning"   => "⚠️",
+            "now"   => "🎸",
+            "wait"  => "🚦",
+            "under" => "⚪️",
+            "keep"  => "📌",
+            "del"   => "❌",
+            "track" => "🌀",
+            "mark"  => "⭐️",
+            "done"  => "✅",
+            "tip"   => "💡",
+        ];
+        
+        return $aMap[$this->sIconType];
     }
     
     private function mapTypeIcon($sType)
     {
-//        $aMap = [
-//            "warning"   => "⚠️",
-//            "now"   => "🎸",
-//            "wait"  => "🚦",
-//            "under" => "⚪️",
-//            "keep"  => "📌",
-//            "del"   => "❌",
-//            "track" => "🌀",
-//            "mark"  => "⭐️",
-//            "done"  => "✅",
-//            "tip"   => "💡",
-//        ];
         
         $aMap = $this->arrTypeIcon();
         
diff --git a/app/Services/TG/Hook/Mod/note_option.php b/app/Services/TG/Hook/Mod/note_option.php
index 5735c174..2b462875 100644
--- a/app/Services/TG/Hook/Mod/note_option.php
+++ b/app/Services/TG/Hook/Mod/note_option.php
@@ -5,7 +5,26 @@ namespace App\Services\TG\Hook\Mod;
 use App\Models\Note as ModelNote;
 use App\Models\NoteOption as ModelNoteOption;
 
-class Note_option extends Base {
+class note_option extends Base {
+    
+    public function set($aParam)
+    {
+        
+        $sKey = $aParam["aOption"][1];
+        $sValue = $aParam["aArg"][1];
+        
+        $oNoteOption = ModelNoteOption::where("key", $sKey)->first();
+        
+        if (!$oNoteOption) {
+            return "没有";
+        }
+        
+        $oNoteOption->value = $sValue;
+        $r = $oNoteOption->save();
+        
+        return $r;
+        
+    }
     
     public function add($aParam)
     {
@@ -20,4 +39,47 @@ class Note_option extends Base {
         return $r;
     }
     
+    public function del($aParam)
+    {
+        $sKey = $aParam["aArg"][1];
+        
+        $oModelNoteOption = ModelNoteOption::where("key", $sKey)->first();
+        $r = $oModelNoteOption->delete();
+        
+        return $r;
+        
+    }
+    
+    public function list($aParam)
+    {
+        $oNoteOptionList = ModelNoteOption::all();
+        
+        return $this->noteOptionToStr($oNoteOptionList);
+    }
+    
+    public function find($aParam)
+    {
+        $sKey = $aParam["aArg"][1];
+        
+        $oNoteOption = ModelNoteOption::where("key", $sKey)->first();
+        
+        if (!$oNoteOption) {
+            return "没有";
+        }
+        
+        return $this->noteOptionToStr([$oNoteOption]);
+    }
+    
+    private function noteOptionToStr($oNoteOption)
+    {
+        $sStr = "";
+        foreach ($oNoteOption as $row) {
+            $sStr .= "\n";
+            $sStr .= $row->key."::".$row->value;
+        }
+        
+        return $sStr;
+        
+    }
+    
 }