From b9418422697ea60f81109af2454e80660df4de9c Mon Sep 17 00:00:00 2001
From: Irfan <irfan-dahir@users.noreply.github.com>
Date: Sat, 18 Sep 2021 19:12:12 +0500
Subject: [PATCH] user list bug fixes

---
 app/Providers/SearchQueryBuilder.php   |  1 -
 app/Providers/UserListQueryBuilder.php | 38 ++++++++++++--------------
 2 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/app/Providers/SearchQueryBuilder.php b/app/Providers/SearchQueryBuilder.php
index b0fddcb..c453552 100755
--- a/app/Providers/SearchQueryBuilder.php
+++ b/app/Providers/SearchQueryBuilder.php
@@ -7,7 +7,6 @@ use Jikan\Model\Anime\Anime;
 use Jikan\Request\Search\AnimeSearchRequest;
 use Jikan\Request\Search\MangaSearchRequest;
 use Jikan\Request\Search\PersonSearchRequest;
-use \voku\helper\AntiXSS;
 use Jikan\Helper\Constants as JikanConstants;
 
 class SearchQueryBuilder
diff --git a/app/Providers/UserListQueryBuilder.php b/app/Providers/UserListQueryBuilder.php
index 4125825..ae3bbed 100755
--- a/app/Providers/UserListQueryBuilder.php
+++ b/app/Providers/UserListQueryBuilder.php
@@ -124,7 +124,7 @@ class UserListQueryBuilder
         }
 
         // animelist only queries
-        if ($request instanceof UserAnimeListRequest) {
+        if ($parser instanceof UserAnimeListRequest) {
 
             // order by
             if ($orderBy !== null && array_key_exists($orderBy, self::VALID_ANIME_ORDER_BY)) {
@@ -141,27 +141,25 @@ class UserListQueryBuilder
             }
 
             // aired from
-            if ($airedFrom !== null) {
-                if (preg_match("~[0-9]{4}-[0-9]{2}-[0-9]{2}~", $airedFrom)) {
-                    $airedFrom = explode("-", $airedFrom);
+            if ($airedFrom !== null && preg_match("~[0-9]{4}-[0-9]{1,2}-[0-9]{1,2}~", $airedFrom)) {
+                $airedFrom = explode("-", $airedFrom);
 
-                    $parser->setAiredFrom(
-                        (int) $airedFrom[2],
-                        (int) $airedFrom[1],
-                        (int) $airedFrom[0]
-                    );
-                }
+                $parser->setAiredFrom(
+                    (int) $airedFrom[0],
+                    (int) $airedFrom[1],
+                    (int) $airedFrom[2]
+                );
             }
 
             // aired to
             if ($airedTo !== null) {
-                if (preg_match("~[0-9]{4}-[0-9]{2}-[0-9]{2}~", $airedTo)) {
+                if (preg_match("~[0-9]{4}-[0-9]{1,2}-[0-9]{1,2}~", $airedTo)) {
                     $airedTo = explode("-", $airedTo);
 
                     $parser->setAiredTo(
-                        (int) $airedTo[2],
+                        (int) $airedTo[0],
                         (int) $airedTo[1],
-                        (int) $airedTo[0]
+                        (int) $airedTo[2]
                     );
                 }
             }
@@ -190,7 +188,7 @@ class UserListQueryBuilder
 
         }
 
-        if ($request instanceof UserMangaListRequest) {
+        if ($parser instanceof UserMangaListRequest) {
             // order by
             if ($orderBy !== null && array_key_exists($orderBy, self::VALID_MANGA_ORDER_BY)) {
                 $orderBy = self::VALID_MANGA_ORDER_BY[$orderBy];
@@ -207,26 +205,26 @@ class UserListQueryBuilder
 
             // published from
             if ($publishedFrom !== null) {
-                if (preg_match("~[0-9]{4}-[0-9]{2}-[0-9]{2}~", $publishedFrom)) {
+                if (preg_match("~[0-9]{4}-[0-9]{1,2}-[0-9]{1,2}~", $publishedFrom)) {
                     $publishedFrom = explode("-", $publishedFrom);
 
                     $parser->setPublishedFrom(
-                        (int) $publishedFrom[2],
+                        (int) $publishedFrom[0],
                         (int) $publishedFrom[1],
-                        (int) $publishedFrom[0]
+                        (int) $publishedFrom[2]
                     );
                 }
             }
 
             // published to
             if ($publishedTo !== null) {
-                if (preg_match("~[0-9]{4}-[0-9]{2}-[0-9]{2}~", $publishedTo)) {
+                if (preg_match("~[0-9]{4}-[0-9]{1,2}-[0-9]{1,2}~", $publishedTo)) {
                     $publishedTo = explode("-", $publishedTo);
 
                     $parser->setPublishedTo(
-                        (int) $publishedTo[2],
+                        (int) $publishedTo[0],
                         (int) $publishedTo[1],
-                        (int) $publishedTo[0]
+                        (int) $publishedTo[2]
                     );
                 }
             }