timw4mail/HummingBirdAnimeClient
1
1
Fork 1
Code Issues 5 Pull Requests Projects 1 Releases Wiki Activity

Version 5.1 - All the GraphQL #32

Closed
timw4mail wants to merge 1160 commits from develop into master
pull from: develop
merge into: timw4mail:master
Conversation 0 Commits 1160 Files Changed 547 +22 -7
1 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d6b7075229 - Show all commits

29
src/API/Kitsu/Model.php
View File

@ -386,14 +386,20 @@ class Model {
if ( ! $cacheItem->isHit()) if ( ! $cacheItem->isHit())
{ {
$output = [ $output = [];
Title::WATCHING => $this->getAnimeList(KitsuWatchingStatus::WATCHING), $statuses = [
Title::PLAN_TO_WATCH => $this->getAnimeList(KitsuWatchingStatus::PLAN_TO_WATCH), Title::WATCHING => KitsuWatchingStatus::WATCHING,
Title::ON_HOLD => $this->getAnimeList(KitsuWatchingStatus::ON_HOLD), Title::PLAN_TO_WATCH => KitsuWatchingStatus::PLAN_TO_WATCH,
Title::DROPPED => $this->getAnimeList(KitsuWatchingStatus::DROPPED), Title::ON_HOLD, KitsuWatchingStatus::ON_HOLD,
Title::COMPLETED => $this->getAnimeList(KitsuWatchingStatus::COMPLETED) Title::DROPPED => KitsuWatchingStatus::DROPPED,
Title::COMPLETED => KitsuWatchingStatus::COMPLETED
]; ];
foreach ($statuses as $key => $status)
{
$output[$key] = $this->getAnimeList($status) ?? [];
}
$cacheItem->set($output); $cacheItem->set($output);
$cacheItem->save(); $cacheItem->save();
} }
@ -413,7 +419,16 @@ class Model {
if ( ! $cacheItem->isHit()) if ( ! $cacheItem->isHit())
{ {
$data = $this->getRawAnimeList($status); $data = $this->getRawAnimeList($status) ?? [];
// Bail out on no data
if (empty($data))
{
$cacheItem->set([]);
$cacheItem->save();
return $cacheItem->get();
}
$included = JsonAPI::organizeIncludes($data['included']); $included = JsonAPI::organizeIncludes($data['included']);
$included = JsonAPI::inlineIncludedRelationships($included, 'anime'); $included = JsonAPI::inlineIncludedRelationships($included, 'anime');