tom/dd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
hellcat 2025-06-10 19:46:44 +08:00
parent 6b40b75ef8
commit 88259e2970
3 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/SakaiController.php
View File

@ -299,6 +299,10 @@ class SakaiController
$s = "/hook#set /book#"; $s = "/hook#set /book#";
$s = "rag ss"; $s = "rag ss";
$s = "fire_toggle"; $s = "fire_toggle";
$s = "type todo";
$s = "toDone 123";
$s = "optionSet todo_show_type 1";
$s = "openRe";
// $s = "back"; // $s = "back";
// movetoId和like列表 // movetoId和like列表

8
app/Models/Book.php
View File

@ -94,8 +94,12 @@ class Book extends Model
$aOrder = explode(",", $sTodoOrder); $aOrder = explode(",", $sTodoOrder);
if ($iPage !== "all") { if ($iPage !== "all") {
$oSelf = $oSelf->where("rank", "!=", "done");
$oSelf = $oSelf->where("rank", "!=", "block"); if (isset($aRagOption["todo_show_type"]) && $aRagOption["todo_show_type"] == 1) {
$oSelf = $oSelf->where("rank", "!=", "done");
$oSelf = $oSelf->where("rank", "!=", "block");
}
} }
$oSelf = $oSelf->orderByRaw("rank IS NULL, FIELD(rank, " . $sTodoOrder . ") ".$sOrderType); $oSelf = $oSelf->orderByRaw("rank IS NULL, FIELD(rank, " . $sTodoOrder . ") ".$sOrderType);

11
app/Services/TG/Hook/Mod/Book.php
View File

@ -43,7 +43,8 @@ class Book extends Base {
$this->aRagOption = json_decode($this->oRag->option, true); $this->aRagOption = json_decode($this->oRag->option, true);
} else { } else {
$this->aRagOption = []; $this->aRagOption = [];
$this->aRagOption["fire_show"] = false; // $this->aRagOption["fire_show"] = false;
// $this->aRagOption["todo_show_type"] = 1;
} }
} }
@ -275,6 +276,9 @@ class Book extends Base {
if ($sType == "todo") { if ($sType == "todo") {
$oParentRag->order = "rank_todo"; $oParentRag->order = "rank_todo";
$oParentRag->option = json_encode([
"todo_show_type" => 1
]);
} }
$r = $oParentRag->save(); $r = $oParentRag->save();
@ -1576,7 +1580,6 @@ class Book extends Base {
// fire倒计时列表 // fire倒计时列表
public function firel() public function firel()
{ {
// tomd(11, 1);
$iLimit = ModelBookOption::_hit("fire_limit"); $iLimit = ModelBookOption::_hit("fire_limit");
$oBookFire = ModelBook::where("fire", "!=", NULL)->orderBy("fire")->limit($iLimit)->get(); $oBookFire = ModelBook::where("fire", "!=", NULL)->orderBy("fire")->limit($iLimit)->get();
@ -1952,7 +1955,7 @@ class Book extends Base {
{ {
$arr = []; $arr = [];
// tomd(@$arr["zz"]); tomd($arr["zz"]);
} }
//// 字符串生成 系列 //// 字符串生成 系列
private function bookToStr($oBook) private function bookToStr($oBook)
@ -2100,7 +2103,7 @@ class Book extends Base {
$sStr .= ":".$this->_RankMap($oRag->rank); $sStr .= ":".$this->_RankMap($oRag->rank);
} }
// tomd($this->oRag->option, 1); // tomd($this->oRag->option, 1);
if ($this->aRagOption["fire_show"] == true && $oRag->fire) { if ((isset($this->aRagOption["fire_show"]) && $this->aRagOption["fire_show"] == true) && $oRag->fire) {
$iDayLine = ceil((strtotime($oRag->fire) - time()) / 86400); $iDayLine = ceil((strtotime($oRag->fire) - time()) / 86400);