From aba6c498e04c0cdb4cc56fd004b3413e48eee977 Mon Sep 17 00:00:00 2001 From: hellcat <> Date: Wed, 16 Jul 2025 19:51:01 +0800 Subject: [PATCH] no message --- app/Models/Me.php | 5 + app/Services/TG/Hook/Mod/DDT.php | 225 +++++++++++++++++-------------- 2 files changed, 128 insertions(+), 102 deletions(-) diff --git a/app/Models/Me.php b/app/Models/Me.php index 07d1e3cd..b7d53a0a 100755 --- a/app/Models/Me.php +++ b/app/Models/Me.php @@ -9,6 +9,11 @@ class Me extends Model protected $table = 'me'; public $timestamps = false; + protected $fillable = [ + 'rag', + 'class', + ]; + // public static function } diff --git a/app/Services/TG/Hook/Mod/DDT.php b/app/Services/TG/Hook/Mod/DDT.php index e86bb10b..c9bc452b 100644 --- a/app/Services/TG/Hook/Mod/DDT.php +++ b/app/Services/TG/Hook/Mod/DDT.php @@ -193,124 +193,145 @@ class DDT extends Base { //// me系列 public function me() { - $oMe = ModelMe::where("class", $this->sThisName)->get(); + $oMe = ModelMe::where("class", $this->sThisName)->first(); - if ($oMe->isEmpty()) { + if (!$oMe) { return "空"; } - return $this->meToStr_list($oMe); + return $oMe->rag; } - public function meAdd($aParam) - { - $aRag = $aParam["aArg"] ?? false; - $sRag = implode(" ", $aRag); - - if ($sRag == "?") { - return "meAdd {value}"; - } - - if (!$sRag) { - return "需要value"; - } - - $oMe = new ModelMe(); - $oMe->class = $this->sThisName; - $oMe->rag = $sRag; - $oMe->save(); - - return $this->toJson($oMe); - } - - public function meLike($aParam) + public function meEdit($aParam) { $sValue = $aParam["aArg"][1] ?? false; if ($sValue == "?") { - return "meLike {value}"; + return "/meEdit {value}"; } - if (!$sValue) { - return "需要value"; - } - - $oMe = ModelMe::where("rag", "like", "%".$sValue."%")->get(); - - return $this->meToStr_list($oMe); + $aWhere = [ + "class" => $this->sThisName, + ]; + + $aValue = [ + "rag" => $sValue, + ]; + + $oMe = ModelMe::updateOrCreate($aWhere, $aValue); + + return $this->me(); } - public function meSet($aParam) - { - $iId = $aParam["aOption"][1] ?? false; - $sValue = $aParam["aArg"][1] ?? false; - - if ($sValue == "?") { - return "#meSet__{id} {value}"; - } - - if (!$sValue) { - return "需要value"; - } - - $oMe = ModelMe::find($iId); - - if (!$oMe) { - return "没找到这个"; - } - - $oMe->rag = $sValue; - $oMe->save(); - - return $this->toJson($oMe); - } +// public function meAdd($aParam) +// { +// $aRag = $aParam["aArg"] ?? false; +// $sRag = implode(" ", $aRag); +// +// if ($sRag == "?") { +// return "meAdd {value}"; +// } +// +// if (!$sRag) { +// return "需要value"; +// } +// +// $oMe = new ModelMe(); +// $oMe->class = $this->sThisName; +// $oMe->rag = $sRag; +// $oMe->save(); +// +// return $this->toJson($oMe); +// } - public function meDelDone($aParam) - { - $aParam["isDone"] = true; - - return $this->meDel($aParam); - } +// public function meLike($aParam) +// { +// $sValue = $aParam["aArg"][1] ?? false; +// +// if ($sValue == "?") { +// return "meLike {value}"; +// } +// +// if (!$sValue) { +// return "需要value"; +// } +// +// $oMe = ModelMe::where("rag", "like", "%".$sValue."%")->get(); +// +// return $this->meToStr_list($oMe); +// } - public function meDel($aParam) - { - if ($aParam["aArg"][1] == "?") { - return "#meDel {id多个}"; - } - - $aId = $aParam["aArg"] ?? []; - $isDone = $aParam["isDone"] ?? false; - - if (!$aId) { - return "需要id"; - } - - $oMe = ModelMe::whereIn("id", $aId)->get(); - - if ($oMe->isEmpty()) { - return "没找到这个"; - } - - if ($isDone === false) { - - $sMsg = "删除这几个,确认用meDelDone。\n\n"; - - $sMe = $this->meToStr_list($oMe); - - return $sMsg.$sMe; - } - - if ($isDone === true) { - - $i = 0; - foreach ($oMe as $oMeRow) { - $r = $oMeRow->delete(); - $i = $i+$r; - } - - return "删除".$i."条数据"; - } - } +// public function meSet($aParam) +// { +// $iId = $aParam["aOption"][1] ?? false; +// $sValue = $aParam["aArg"][1] ?? false; +// +// if ($sValue == "?") { +// return "#meSet__{id} {value}"; +// } +// +// if (!$sValue) { +// return "需要value"; +// } +// +// $oMe = ModelMe::find($iId); +// +// if (!$oMe) { +// return "没找到这个"; +// } +// +// $oMe->rag = $sValue; +// $oMe->save(); +// +// return $this->toJson($oMe); +// } + +// public function meDelDone($aParam) +// { +// $aParam["isDone"] = true; +// +// return $this->meDel($aParam); +// } + +// public function meDel($aParam) +// { +// if ($aParam["aArg"][1] == "?") { +// return "#meDel {id多个}"; +// } +// +// $aId = $aParam["aArg"] ?? []; +// $isDone = $aParam["isDone"] ?? false; +// +// if (!$aId) { +// return "需要id"; +// } +// +// $oMe = ModelMe::whereIn("id", $aId)->get(); +// +// if ($oMe->isEmpty()) { +// return "没找到这个"; +// } +// +// if ($isDone === false) { +// +// $sMsg = "删除这几个,确认用meDelDone。\n\n"; +// +// $sMe = $this->meToStr_list($oMe); +// +// return $sMsg.$sMe; +// } +// +// if ($isDone === true) { +// +// $i = 0; +// foreach ($oMe as $oMeRow) { +// $r = $oMeRow->delete(); +// $i = $i+$r; +// } +// +// return "删除".$i."条数据"; +// } +// } //// me系列 end private function filterRow($oSelfRow)