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

4.1 Beta...ish #12

Merged
timw4mail merged 88 commits from develop into master 2018-11-05 13:15:59 -05:00
Conversation 0 Commits 88 Files Changed 260 +23 -24
2 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 14be365a16 - Show all commits

16
src/API/Kitsu.php
View File

@ -45,17 +45,17 @@ final class Kitsu {
$isDoneAiring = $now > $endAirDate; $isDoneAiring = $now > $endAirDate;
$isCurrentlyAiring = ($now > $startAirDate) && ! $isDoneAiring; $isCurrentlyAiring = ($now > $startAirDate) && ! $isDoneAiring;
switch (TRUE) if ($isCurrentlyAiring)
{ {
case $isCurrentlyAiring:
return AnimeAiringStatus::AIRING; return AnimeAiringStatus::AIRING;
case $isDoneAiring:
return AnimeAiringStatus::FINISHED_AIRING;
default:
return AnimeAiringStatus::NOT_YET_AIRED;
} }
if ($isDoneAiring)
{
return AnimeAiringStatus::FINISHED_AIRING;
}
return AnimeAiringStatus::NOT_YET_AIRED;
} }
/** /**

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

@ -839,23 +839,22 @@ final class Model {
$baseData = $this->listItem->get($listId); $baseData = $this->listItem->get($listId);
$included = JsonAPI::organizeIncludes($baseData['included']); $included = JsonAPI::organizeIncludes($baseData['included']);
if (array_key_exists('anime', $included))
switch (TRUE)
{ {
case array_key_exists('anime', $included): // in_array('anime', array_keys($included)):
$included = JsonAPI::inlineIncludedRelationships($included, 'anime'); $included = JsonAPI::inlineIncludedRelationships($included, 'anime');
$baseData['data']['included'] = $included; $baseData['data']['included'] = $included;
return $this->animeListTransformer->transform($baseData['data']); return $this->animeListTransformer->transform($baseData['data']);
}
case array_key_exists('manga', $included): // in_array('manga', array_keys($included)): if (array_key_exists('manga', $included))
{
$included = JsonAPI::inlineIncludedRelationships($included, 'manga'); $included = JsonAPI::inlineIncludedRelationships($included, 'manga');
$baseData['data']['included'] = $included; $baseData['data']['included'] = $included;
$baseData['data']['manga'] = $baseData['included'][0]; $baseData['data']['manga'] = $baseData['included'][0];
return $this->mangaListTransformer->transform($baseData['data']); return $this->mangaListTransformer->transform($baseData['data']);
default:
return $baseData['data'];
} }
return $baseData['data'];
} }
/** /**