From f2b7f61030ed43bb8f8f6f06f6a3e6b89435a5d5 Mon Sep 17 00:00:00 2001
From: "Timothy J. Warren" <tim@timshomepage.net>
Date: Thu, 18 May 2023 16:25:50 -0400
Subject: [PATCH] More user page tweaks

---
 app/views/user/details.php                        |  7 +++++--
 src/AnimeClient/API/Anilist/.graphqlconfig        | 15 ---------------
 src/AnimeClient/API/Anilist/graphql.config.yml    |  8 ++++++++
 src/AnimeClient/API/Kitsu/.graphqlconfig          | 15 ---------------
 .../API/Kitsu/Queries/UserDetails.graphql         |  1 +
 .../API/Kitsu/Transformer/UserTransformer.php     | 11 ++++++-----
 src/AnimeClient/API/Kitsu/graphql.config.yml      |  8 ++++++++
 src/AnimeClient/Controller/User.php               |  6 ++++++
 src/AnimeClient/Types/User.php                    |  5 +++--
 9 files changed, 37 insertions(+), 39 deletions(-)
 delete mode 100644 src/AnimeClient/API/Anilist/.graphqlconfig
 create mode 100644 src/AnimeClient/API/Anilist/graphql.config.yml
 delete mode 100644 src/AnimeClient/API/Kitsu/.graphqlconfig
 create mode 100644 src/AnimeClient/API/Kitsu/graphql.config.yml

diff --git a/app/views/user/details.php b/app/views/user/details.php
index 3bb45482..d813fad0 100644
--- a/app/views/user/details.php
+++ b/app/views/user/details.php
@@ -16,7 +16,9 @@ use Aviat\AnimeClient\Kitsu;
 		<aside class="info">
 			<table class="media-details invisible">
 				<tr>
-					<td><?= $helper->img($data['avatar'], ['alt' => '']); ?></td>
+					<?php if($data['avatar'] !== null): ?>
+					<td><?= $helper->img($data['avatar'], ['alt' => '', 'width' => '225']); ?></td>
+					<?php endif ?>
 					<td><?= $escape->html($data['about']) ?></td>
 				</tr>
 			</table>
@@ -25,6 +27,7 @@ use Aviat\AnimeClient\Kitsu;
 				<?php foreach ([
 					'joinDate' => 'Joined',
 					'birthday' => 'Birthday',
+					'gender' => 'Gender',
 					'location' => 'Location'
 			   ] as $key => $label): ?>
 				<?php if ($data[$key] !== null): ?>
@@ -42,7 +45,7 @@ use Aviat\AnimeClient\Kitsu;
 				</tr>
 				<?php endif ?>
 
-				<?php if ( ! empty($data['waifu'])): ?>
+				<?php if ($data['waifu']['character'] !== null): ?>
 				<tr>
 					<td><?= $escape->html($data['waifu']['label']) ?></td>
 					<td>
diff --git a/src/AnimeClient/API/Anilist/.graphqlconfig b/src/AnimeClient/API/Anilist/.graphqlconfig
deleted file mode 100644
index 7689e637..00000000
--- a/src/AnimeClient/API/Anilist/.graphqlconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "name": "Anilist Schema",
-  "schemaPath": "schema.graphql",
-  "extensions": {
-	"endpoints": {
-	  "Anilist": {
-		"url": "https://graphql.anilist.co",
-		"headers": {
-		  "user-agent": "JS GraphQL"
-		},
-		"introspect": true
-	  }
-	}
-  }
-}
\ No newline at end of file
diff --git a/src/AnimeClient/API/Anilist/graphql.config.yml b/src/AnimeClient/API/Anilist/graphql.config.yml
new file mode 100644
index 00000000..bc5b3a44
--- /dev/null
+++ b/src/AnimeClient/API/Anilist/graphql.config.yml
@@ -0,0 +1,8 @@
+schema: schema.graphql
+extensions:
+  endpoints:
+    Anilist:
+      url: https://graphql.anilist.co
+      headers:
+        user-agent: JS GraphQL
+      introspect: true
diff --git a/src/AnimeClient/API/Kitsu/.graphqlconfig b/src/AnimeClient/API/Kitsu/.graphqlconfig
deleted file mode 100644
index bc41639c..00000000
--- a/src/AnimeClient/API/Kitsu/.graphqlconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "name": "Kitsu Schema",
-  "schemaPath": "schema.graphql",
-  "extensions": {
-	"endpoints": {
-	  "Kitsu": {
-		"url": "https://kitsu.io/api/graphql",
-		"headers": {
-		  "user-agent": "JS GraphQL"
-		},
-		"introspect": true
-	  }
-	}
-  }
-}
\ No newline at end of file
diff --git a/src/AnimeClient/API/Kitsu/Queries/UserDetails.graphql b/src/AnimeClient/API/Kitsu/Queries/UserDetails.graphql
index 7e86069a..e6b709f0 100644
--- a/src/AnimeClient/API/Kitsu/Queries/UserDetails.graphql
+++ b/src/AnimeClient/API/Kitsu/Queries/UserDetails.graphql
@@ -21,6 +21,7 @@ query ($slug: String!) {
 		createdAt
 		id
 		location
+		gender
 		name
 		proMessage
 		proTier
diff --git a/src/AnimeClient/API/Kitsu/Transformer/UserTransformer.php b/src/AnimeClient/API/Kitsu/Transformer/UserTransformer.php
index 7154861c..271eb798 100644
--- a/src/AnimeClient/API/Kitsu/Transformer/UserTransformer.php
+++ b/src/AnimeClient/API/Kitsu/Transformer/UserTransformer.php
@@ -39,17 +39,18 @@ final class UserTransformer extends AbstractTransformer
 		] : [];
 
 		return User::from([
-			'about' => $base['about'],
-			'avatar' => $base['avatarImage']['original']['url'],
-			'birthday' => Kitsu::formatDate($base['birthday']) . ' (' . Kitsu::friendlyTime(Kitsu::getDateDiff($base['birthday']), 'year') . ')',
-			'joinDate' => Kitsu::formatDate($base['createdAt']) . ' (' . Kitsu::friendlyTime(Kitsu::getDateDiff($base['createdAt']), 'day') . ')',
+			'about' => $base['about'] ?? '',
+			'avatar' => $base['avatarImage']['original']['url'] ?? null,
+			'birthday' => $base['birthday'] !== null ? Kitsu::formatDate($base['birthday']) . ' (' . Kitsu::friendlyTime(Kitsu::getDateDiff($base['birthday']), 'year') . ')' : null,
+			'joinDate' => Kitsu::formatDate($base['createdAt']) . ' (' . Kitsu::friendlyTime(Kitsu::getDateDiff($base['createdAt']), 'day') . ' ago)',
+			'gender' => $base['gender'],
 			'favorites' => $this->organizeFavorites($favorites),
 			'location' => $base['location'],
 			'name' => $base['name'],
 			'slug' => $base['slug'],
 			'stats' => $this->organizeStats($stats),
 			'waifu' => $waifu,
-			'website' => $base['siteLinks']['nodes'][0]['url'],
+			'website' => $base['siteLinks']['nodes'][0]['url'] ?? null,
 		]);
 	}
 
diff --git a/src/AnimeClient/API/Kitsu/graphql.config.yml b/src/AnimeClient/API/Kitsu/graphql.config.yml
new file mode 100644
index 00000000..82a6e896
--- /dev/null
+++ b/src/AnimeClient/API/Kitsu/graphql.config.yml
@@ -0,0 +1,8 @@
+schema: schema.graphql
+extensions:
+  endpoints:
+    Kitsu:
+      url: https://kitsu.io/api/graphql
+      headers:
+        user-agent: JS GraphQL
+      introspect: true
diff --git a/src/AnimeClient/Controller/User.php b/src/AnimeClient/Controller/User.php
index 4a0268d6..a44de592 100644
--- a/src/AnimeClient/Controller/User.php
+++ b/src/AnimeClient/Controller/User.php
@@ -69,6 +69,12 @@ final class User extends BaseController
 			: $username;
 
 		$rawData = $this->kitsuModel->getUserData($username);
+		if ($rawData['data']['findProfileBySlug'] === null)
+		{
+			$this->notFound('Sorry, user not found', "The user '$username' does not seem to exist.");
+			return;
+		}
+
 		$data = (new UserTransformer())->transform($rawData)->toArray();
 
 		$this->outputHTML('user/details', [
diff --git a/src/AnimeClient/Types/User.php b/src/AnimeClient/Types/User.php
index 655e7644..14678493 100644
--- a/src/AnimeClient/Types/User.php
+++ b/src/AnimeClient/Types/User.php
@@ -22,12 +22,13 @@ final class User extends AbstractType
 	public ?string $about;
 	public ?string $avatar;
 	public ?string $birthday;
-	public ?string $joinDate;
+	public string $joinDate;
+	public ?string $gender;
 	public ?array $favorites;
 	public ?string $location;
 	public ?string $name;
 	public ?string $slug;
 	public ?array $stats;
-	public ?array $waifu;
+	public array $waifu;
 	public ?string $website;
 }