From 59446649f662f3a67a03190dd08099f09fe6fd95 Mon Sep 17 00:00:00 2001
From: Timothy J Warren <tim@timshomepage.net>
Date: Tue, 11 Apr 2017 09:28:07 -0400
Subject: [PATCH] Fix changing a list item's status with no score or progress
 on MAL

---
 humbug.json.dist                                 | 12 ------------
 src/API/Kitsu/Model.php                          |  2 +-
 src/API/MAL/Transformer/AnimeListTransformer.php |  8 +++++---
 src/Controller/Anime.php                         |  6 +++---
 4 files changed, 9 insertions(+), 19 deletions(-)
 delete mode 100644 humbug.json.dist

diff --git a/humbug.json.dist b/humbug.json.dist
deleted file mode 100644
index d1e38834..00000000
--- a/humbug.json.dist
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "source": {
-        "directories": [
-            "src"
-        ]
-    },
-    "timeout": 10,
-    "logs": {
-        "text": "build\/humbuglog.txt",
-        "json": "build\/humbug.json"
-    }
-}
\ No newline at end of file
diff --git a/src/API/Kitsu/Model.php b/src/API/Kitsu/Model.php
index fbb07305..e5924714 100644
--- a/src/API/Kitsu/Model.php
+++ b/src/API/Kitsu/Model.php
@@ -285,7 +285,7 @@ class Model {
 		}
 
 		$transformed = $this->animeTransformer->transform($baseData);
-		$transformed['included'] = $baseData['included'];
+		$transformed['included'] = JsonAPI::organizeIncluded($baseData['included']);
 		return $transformed;
 	}
 
diff --git a/src/API/MAL/Transformer/AnimeListTransformer.php b/src/API/MAL/Transformer/AnimeListTransformer.php
index 222a3600..2e74dceb 100644
--- a/src/API/MAL/Transformer/AnimeListTransformer.php
+++ b/src/API/MAL/Transformer/AnimeListTransformer.php
@@ -44,9 +44,7 @@ class AnimeListTransformer extends AbstractTransformer {
 	{
 		$map = [
 			'id' => $item['mal_id'],
-			'data' => [
-				'episode' => $item['data']['progress']
-			]
+			'data' => []
 		];
 
 		$data =& $item['data'];
@@ -55,6 +53,10 @@ class AnimeListTransformer extends AbstractTransformer {
 		{
 			switch($key)
 			{
+				case 'progress':
+					$map['data']['episode'] = $value;
+				break;
+				
 				case 'notes':
 					$map['data']['comments'] = $value;
 				break;
diff --git a/src/Controller/Anime.php b/src/Controller/Anime.php
index 48fa800d..90cbac2c 100644
--- a/src/Controller/Anime.php
+++ b/src/Controller/Anime.php
@@ -280,11 +280,11 @@ class Anime extends BaseController {
 			);
 		}
 
-		foreach($data['included'] as $included)
+		if (array_key_exists('characters', $data['included']))
 		{
-			if ($included['type'] === 'characters')
+			foreach($data['included']['characters'] as $id => $character)
 			{
-				$characters[$included['id']] = $included['attributes'];
+				$characters[$id] = $character['attributes'];
 			}
 		}