malhuda/jikan-rest
1
0
Fork 0
mirror of https://github.com/jikan-me/jikan-rest.git synced 2025-02-20 11:23:35 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into container-image-annotations1

Browse Source
This commit is contained in:
Irfan (Nekomata) 2023-10-28 09:04:17 +05:00 committed by GitHub
commit 344c887ea8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Features/QueryAnimeListOfUserHandler.php
View File

@ -60,7 +60,8 @@ final class QueryAnimeListOfUserHandler extends RequestHandlerWithScraperCache
$jikanParserRequest = $requestParams->get("jikanParserRequest"); $jikanParserRequest = $requestParams->get("jikanParserRequest");
return $this->scraperService->findList( return $this->scraperService->findList(
$requestFingerPrint, $requestFingerPrint,
fn(MalClient $jikan, ?int $page = null) => ["anime" => $jikan->getUserAnimeList($jikanParserRequest)] fn(MalClient $jikan, ?int $page = null) => ["anime" => $jikan->getUserAnimeList($jikanParserRequest)],
$requestParams->get("page", 1)
); );
} }
} }

3
app/Features/QueryMangaListOfUserHandler.php
View File

@ -60,7 +60,8 @@ final class QueryMangaListOfUserHandler extends RequestHandlerWithScraperCache
$jikanParserRequest = $requestParams->get("jikanParserRequest"); $jikanParserRequest = $requestParams->get("jikanParserRequest");
return $this->scraperService->findList( return $this->scraperService->findList(
$requestFingerPrint, $requestFingerPrint,
fn(MalClient $jikan, ?int $page = null) => ["anime" => $jikan->getUserMangaList($jikanParserRequest)] fn(MalClient $jikan, ?int $page = null) => ["anime" => $jikan->getUserMangaList($jikanParserRequest)],
$requestParams->get("page", 1)
); );
} }
} }

4
app/Services/JikanUserListRequestMapperService.php
View File

@ -28,10 +28,6 @@ final class JikanUserListRequestMapperService
$values["sort"] = $values["sort"] === "asc" ? -1 : 1; $values["sort"] = $values["sort"] === "asc" ? -1 : 1;
} }
if (!array_key_exists("page", $values)) {
$values["page"] = 1;
}
if ($listType->equals(UserListTypeEnum::anime())) { if ($listType->equals(UserListTypeEnum::anime())) {
$rangeFrom = "airedFrom"; $rangeFrom = "airedFrom";
$rangeTo = "airedTo"; $rangeTo = "airedTo";

4
container-setup.sh
View File

@ -43,7 +43,7 @@ validate_prereqs() {
podman_exists=$(command -v podman) podman_exists=$(command -v podman)
podman_compose_exists=$(command -v podman-compose) podman_compose_exists=$(command -v podman-compose)
if [ -x "$docker_exists" ] && [ -x "$podman_exists" ]; then if [ ! -x "$docker_exists" ] && [ ! -x "$podman_exists" ]; then
echo -e "'docker' is not installed. \xE2\x9D\x8C" echo -e "'docker' is not installed. \xE2\x9D\x8C"
exit 1 exit 1
else else
@ -61,7 +61,7 @@ validate_prereqs() {
DOCKER_CMD="podman" DOCKER_CMD="podman"
fi fi
if [ -x "$docker_compose_exists" ] && [ -x "$docker_compose_exists" ]; then if [ ! -x "$docker_compose_exists" ] && [ ! -x "$podman_compose_exists" ]; then
echo -e "'docker-compose' is not installed. \xE2\x9D\x8C" echo -e "'docker-compose' is not installed. \xE2\x9D\x8C"
exit 1 exit 1
else else