jikan-me · pushrbx · Jan 20, 2024 · Jan 17, 2024 · Jan 20, 2024 · Jan 20, 2024
@@ -120,32 +120,34 @@ public function getAiredBetween(
         ?string $premiered = null
     ): EloquentBuilder
     {
-//        $queryable = $this->queryable(true)->whereBetween("aired.from", [
-//            $from->toAtomString(),
-//            $to->modify("last day of this month")->toAtomString()
-//        ]);
-
         /** @noinspection PhpParamsInspection */
         $queryable = $this->queryable(true);
 
+        $airedFilter = ["aired.from" => [
+            '$gte' => $from->toAtomString(),
+            '$lte' => $to->modify("last day of this month")->toAtomString()
+        ]];
+
+        $finalFilter = [];
+
         if ($premiered !== null) {
-            $queryable = $queryable
-                ->where("premiered", null)
-                ->orWhere("premiered", $premiered);
+            $finalFilter['$or'] = [
+                ["premiered" => $premiered],
+                [
+                    "premiered" => null,
+                    ...$airedFilter
+                ]
+            ];
+        } else {
+            $finalFilter = array_merge($finalFilter, $airedFilter);
         }
 
-        $queryable = $queryable
-            ->whereRaw([
-            "aired.from" => [
-                '$gte' => $from->toAtomString(),
-                '$lte' => $to->modify("last day of this month")->toAtomString()
-            ]
-        ]);
-
         if (!is_null($type)) {
-            $queryable = $queryable->where("type", $type->label);
+            $finalFilter["type"] = $type->label;
         }
 
+        $queryable = $queryable->whereRaw($finalFilter);
+
         return $queryable->orderBy("members", "desc");
     }